fixing code where no variable type is defined for arrays

gesslar · thefallentree · commit e48ebafb94e6 · 2022-02-15T18:44:22.000-08:00
diff --git a/lib/WWW/cgi/autodoc.c b/lib/WWW/cgi/autodoc.c
@@ -202,7 +202,7 @@ string object_summary_line(string arg)
 
 string handle_overview(string part)
 {
-  *tmp;
+  string *tmp;
     
   string ret = @END
 <title>Mudlib Overview</title>
diff --git a/lib/WWW/cgi/mudlist.c b/lib/WWW/cgi/mudlist.c
@@ -47,9 +47,9 @@ string main(string pattern)
   mapping	mudlist	= IMUD_D->query_mudlist();
   int		nummuds = sizeof(mudlist);
   string * muds = keys(mudlist);
-  *	data;
+  mixed *	data;
   string * matches;
-  *        arg;
+  mixed * arg;
 
   if ( !pattern )
     matches = muds;
diff --git a/lib/cmds/create/addexit.c b/lib/cmds/create/addexit.c
@@ -17,7 +17,7 @@ private string reverse(string dir) {
     }
 }
 
-private void main(*args) {
+private void main(mixed *args) {
     string dir = args[0];
     string where = args[1];
     string fname;
diff --git a/lib/cmds/create/newroom.c b/lib/cmds/create/newroom.c
@@ -2,7 +2,7 @@
 
 inherit CMD;
 
-private void main(*args) {
+private void main(mixed *args) {
     string fname = args[0];
     
     if (fname[4..] != ".scr")
diff --git a/lib/cmds/create/scr_command.c b/lib/cmds/create/scr_command.c
@@ -31,7 +31,7 @@ string get_file_name() {
 int add_exit(string fname, string dir, string value) {
     string text = read_file(fname);
     string before, values, after;
-    *parts;
+    string *parts;
     int i, found;
     
     if (!text) {
@@ -102,7 +102,7 @@ int add_exit(string fname, string dir, string value) {
 int change_attribute(string fname, string attr, string what) {
     string text = read_file(fname);
     string before, after;
-    *parts;
+    string *parts;
     int i;
     
     if (!text) {
@@ -150,7 +150,7 @@ int change_attribute(string fname, string attr, string what) {
 
 void update(string fname) {
     object ob;
-    *tosave;
+    object *tosave;
     
     if (ob = find_object(fname)) {
 	tosave = filter(all_inventory(ob), function(object ob) {
diff --git a/lib/cmds/create/setbrief.c b/lib/cmds/create/setbrief.c
@@ -2,7 +2,7 @@
 
 inherit __DIR__ "scr_command";    
 
-private void main(*args) {
+private void main(mixed *args) {
     string brief = implode(args[0], " ");
     string fname;
     
diff --git a/lib/cmds/player/attic/tell.c b/lib/cmds/player/attic/tell.c
@@ -99,7 +99,7 @@ private void main(string arg)
 
 	    if( arg[0] == ';' || arg[0] == ':' )
 	      {
-		*soul_ret;
+		mixed *soul_ret;
 		
 		arg = arg[1..];
 		soul_ret = SOUL_D->parse_imud_soul(arg);
@@ -151,7 +151,7 @@ private void main(string arg)
 
     if( arg[0] == ':' || arg[0] == ';' )
     {
-	*soul_ret;
+	mixed *soul_ret;
 	int tindex;
 
 	arg = arg[1..];
diff --git a/lib/cmds/player/messages.c b/lib/cmds/player/messages.c
@@ -28,7 +28,7 @@ void update_translations() {
      * chooses the second when there is an overlap.
      */
     colours = ANSI_D->defaults() + colours;
-    if (query_shell_ob()->get_variable("ansi"))
+    if (this_user()->query_shell_ob()->get_variable("ansi"))
 	translations = ANSI_D->query_translations()[0];
     else
 	translations = ANSI_D->query_translations()[1];
@@ -51,11 +51,11 @@ void set_colour(string which, string what) {
     save_me();
 }
 
-void query_colour(string which) {
+string query_colour(string which) {
     return colours[which];
 }
 
-*query_colours() {
+string *query_colours() {
     return keys(colours);
 }
 
diff --git a/lib/contrib/bboard/news_d.c b/lib/contrib/bboard/news_d.c
@@ -422,7 +422,7 @@ nomask string * get_groups()
     // expensive
     ret = filter(keys(data), function(string group)
       {
-	  *a;
+	  function *a;
 	  string prefix;
 	  function f;
 	  int i = member_array('.', group, 1) - 1;
@@ -443,7 +443,7 @@ nomask string * get_groups()
 nomask int query_write_to_group( string group )
 {
     function f;
-    *a;
+    function *a;
 
     string prefix;
     int i = member_array('.', group, 1) - 1;
@@ -596,8 +596,8 @@ nomask void change_header( string group, int id, string header )
     return;
 }
 
-*search_for(string what) {
-    *ret = ({});
+mixed *search_for(string what) {
+    mixed *ret = ({});
     
     foreach (string group, mapping contents in data) {
 	foreach (mixed id, class news_msg post in contents) {
@@ -612,8 +612,8 @@ nomask void change_header( string group, int id, string header )
     return ret;
 }
 
-*search_for_author(string who) {
-    *ret = ({});
+mixed *search_for_author(string who) {
+    mixed *ret = ({});
     
     foreach (string group, mapping contents in data) {
 	foreach (mixed id, class news_msg post in contents) {
diff --git a/lib/contrib/bboard/note.c b/lib/contrib/bboard/note.c
@@ -7,6 +7,6 @@ mixed do_note_str_on_obj(string str, object ob) {
 	ob->note(str);
 }
 
-*query_verb_info() {
+mixed *query_verb_info() {
 	return ({({"STR on OBJ"}),({})});
 }
diff --git a/lib/contrib/bboard/read.c b/lib/contrib/bboard/read.c
@@ -100,7 +100,7 @@ void do_read_word_str(string p, string str) {
     
     
 
-*query_verb_info()
+mixed *query_verb_info()
 {
     return ({ ({ "OBJ:v", "from OBJ:v", "in OBJ:v", "about STR",
 		     "about STR in OBJ:v", "about STR from OBJ:v",
diff --git a/lib/contrib/bboard/remove.c b/lib/contrib/bboard/remove.c
@@ -11,6 +11,6 @@ void do_remove_str_from_obj(string str, object ob) {
 	ob->do_remove(str);
 }
 
-*query_verb_info() {
+mixed *query_verb_info() {
     return ({ ({ "OBJ", "STR from OBJ" }), ({ "take off", "unwield" }) });
 }
diff --git a/lib/contrib/last_queue.c b/lib/contrib/last_queue.c
@@ -5,7 +5,7 @@
 class lqueue {
     int size;
     int index;
-    *elems;
+    mixed *elems;
 }
 
 class lqueue lqueue_new(int size) {
@@ -28,6 +28,6 @@ void lqueue_member(class lqueue q, int ind) {
     return q->elems[which];
 }
 
-*lqueue_list(class lqueue q) {
+mixed *lqueue_list(class lqueue q) {
     return q->elems[q->index..] + q->elems[0..q->index-1];
 }
diff --git a/lib/contrib/stack.c b/lib/contrib/stack.c
@@ -2,7 +2,7 @@
 
 class stack {
     int which;
-    *elems;
+    mixed *elems;
 };
 
 class stack stack_new(int size) {
diff --git a/lib/daemons/news_d.c b/lib/daemons/news_d.c
@@ -862,7 +862,7 @@ void dump(string path) {
     write_file(path, ret);
 }
 
-*search_for(string what) {
+mixed *search_for(string what) {
     mixed *ret = ({});
     
     foreach (string group, mapping contents in data) {
@@ -877,7 +877,7 @@ void dump(string path) {
     return ret;
 }
 
-*search_for_author(string who) {
+mixed *search_for_author(string who) {
     mixed *ret = ({});
     
     foreach (string group, mapping contents in data) {
diff --git a/lib/daemons/preposition_d.c b/lib/daemons/preposition_d.c
@@ -52,7 +52,7 @@ mapping preposition_mappings() {
    return oneword_preps + twoword_preps + threeword_preps;
 }
 
-*consolidated_preps() {
+string *consolidated_preps() {
     return clean_array(values(oneword_preps) + values(twoword_preps) +
                        values(threeword_preps));
 }
diff --git a/lib/daemons/task_d.c b/lib/daemons/task_d.c
@@ -15,10 +15,9 @@ inherit M_DAEMON_DATA;
 #define TASK_ATTR 5
 #define TASK_SUB 6
 
-nomask private *find_task(string);
+nomask private mixed *find_task(string);
 
-private
-mixed *tasks = ({});
+private mixed *tasks = ({});
 
 //:FUNCTION query_title
 // Return the title for a given task.
@@ -378,7 +377,7 @@ string add_task(string parent_id, string title, string description, string who)
 
 //:FUNCTION remove_task
 // Remove the specified task.
-*remove_task(string task_id)
+mixed *remove_task(string task_id)
 {
   mixed *task = copy(find_task(task_id));
   string parent_id = resolve_parent_id(task_id);
diff --git a/lib/domains/std/rooms/Labyrinth.c b/lib/domains/std/rooms/Labyrinth.c
@@ -28,7 +28,7 @@ int dy(int i) {
 }
 
 void create() {
-    *valid = allocate(4);
+    int *valid = allocate(4);
     int x, y;
     
     data = allocate(SIZE);
diff --git a/lib/obj/admtool/mudinfo/memory.c b/lib/obj/admtool/mudinfo/memory.c
@@ -12,7 +12,7 @@ nomask string module_key() {
 
 private void obj_and_prog() {
     mapping info = ([]);
-    *k;
+    string *k;
     string ret;
     
     foreach (object o in objects())
diff --git a/lib/obj/mudlib/pshell.c b/lib/obj/mudlib/pshell.c
@@ -81,7 +81,7 @@ protected void execute_command(string original_input)
 {
   string * argv = explode(original_input, " ");
   mixed tmp;
-  *winner;
+  mixed winner;
   string argument;
 
 /* BEGINNING OF EXPANSION */
diff --git a/lib/obj/secure/webed.c b/lib/obj/secure/webed.c
@@ -82,7 +82,7 @@ string format_editor(string user, string password, string filename,
   output = output + "</table>\n";
   if (contents)
     {
-	*inh;
+	string *inh;
 	object ob;
 
 	output +="<hr><font size=+1><strong>Editing: " + HTML_encode(filename) + "</strong></font><p>";
diff --git a/lib/secure/daemons/lpscript_d.c b/lib/secure/daemons/lpscript_d.c
@@ -110,15 +110,15 @@ void do_errors() {
 	error("Script compilation failed:\n" + implode(errors, "\n") + "\n");
 }
 
-*line_info() {
+string *line_info() {
     if (linesync) {
 	linesync = 0;
 	return ({ cur });
     }
     return ({});
 }
 
-*parse_long_string() {
+string *parse_long_string() {
     int first = cur;
     string ind;
     int indent;
diff --git a/lib/secure/user/messages.c b/lib/secure/user/messages.c
@@ -51,11 +51,11 @@ void set_colour(string which, string what) {
     save_me();
 }
 
-void query_colour(string which) {
+string query_colour(string which) {
     return colours[which];
 }
 
-*query_colours() {
+string *query_colours() {
     return keys(colours);
 }
 
diff --git a/lib/std/modules/m_conversation.c b/lib/std/modules/m_conversation.c
@@ -15,7 +15,7 @@ mapping responses = ([]);
 
 mapping current = ([]);
 mapping start = ([]);
-*default_start = ({ });
+mixed *default_start = ({ });
 mixed goodbye_action;
 
 void set_goodbye(mixed arg)
diff --git a/lib/std/modules/m_react.c b/lib/std/modules/m_react.c

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ string object_summary_line(string arg)`
`202`	`202`
`203`	`203`	`string handle_overview(string part)`
`204`	`204`	`{`
`205`		`- *tmp;`
	`205`	`+ string *tmp;`
`206`	`206`
`207`	`207`	`string ret = @END`
`208`	`208`	`<title>Mudlib Overview</title>`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ private string reverse(string dir) {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`		`-private void main(*args) {`
	`20`	`+private void main(mixed *args) {`
`21`	`21`	`string dir = args[0];`
`22`	`22`	`string where = args[1];`
`23`	`23`	`string fname;`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ private void main(string arg)`
`99`	`99`
`100`	`100`	`if( arg[0] == ';' \|\| arg[0] == ':' )`
`101`	`101`	`{`
`102`		`- *soul_ret;`
	`102`	`+ mixed *soul_ret;`
`103`	`103`
`104`	`104`	`arg = arg[1..];`
`105`	`105`	`soul_ret = SOUL_D->parse_imud_soul(arg);`
`@@ -151,7 +151,7 @@ private void main(string arg)`
`151`	`151`
`152`	`152`	`if( arg[0] == ':' \|\| arg[0] == ';' )`
`153`	`153`	`{`
`154`		`- *soul_ret;`
	`154`	`+ mixed *soul_ret;`
`155`	`155`	`int tindex;`
`156`	`156`
`157`	`157`	`arg = arg[1..];`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ void update_translations() {`
`28`	`28`	`* chooses the second when there is an overlap.`
`29`	`29`	`*/`
`30`	`30`	`colours = ANSI_D->defaults() + colours;`
`31`		`- if (query_shell_ob()->get_variable("ansi"))`
	`31`	`+ if (this_user()->query_shell_ob()->get_variable("ansi"))`
`32`	`32`	`translations = ANSI_D->query_translations()[0];`
`33`	`33`	`else`
`34`	`34`	`translations = ANSI_D->query_translations()[1];`
`@@ -51,11 +51,11 @@ void set_colour(string which, string what) {`
`51`	`51`	`save_me();`
`52`	`52`	`}`
`53`	`53`
`54`		`-void query_colour(string which) {`
	`54`	`+string query_colour(string which) {`
`55`	`55`	`return colours[which];`
`56`	`56`	`}`
`57`	`57`
`58`		`-*query_colours() {`
	`58`	`+string *query_colours() {`
`59`	`59`	`return keys(colours);`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ mixed do_note_str_on_obj(string str, object ob) {`
`7`	`7`	`ob->note(str);`
`8`	`8`	`}`
`9`	`9`
`10`		`-*query_verb_info() {`
	`10`	`+mixed *query_verb_info() {`
`11`	`11`	`return ({({"STR on OBJ"}),({})});`
`12`	`12`	`}`