Changeset 58Tweet

Timestamp:

Mar 2, 2008, 4:02:22 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Remove a few duplicate prototype declarations.
• Add some harmless "%s" in sprintf() calls.

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (1 diff)
• cache.cpp (modified) (1 diff)
• clisp.hpp (modified) (1 diff)
• imlib/jmalloc.cpp (modified) (2 diffs)
• innet.cpp (modified) (3 diffs)
• lisp.cpp (modified) (2 diffs)
• menu.cpp (modified) (1 diff)
• nfserver.hpp (modified) (1 diff)

abuse/trunk/src/ant.cpp

@@ -26 +26 @@
         ANT_no_see_time,
         ANT_hide_flag };
-
-void *ant_ai();
 
 int can_see(game_object *o, int32_t x1, int32_t y1, int32_t x2, int32_t y2)

abuse/trunk/src/cache.cpp

@@ -48 +48 @@
 {
   char msg[100];
-  sprintf(msg,symbol_str("calc_crc"));  // this may take some time, show the user a status indicator
+  sprintf(msg, "%s", symbol_str("calc_crc"));  // this may take some time, show the user a status indicator
   if (stat_man) stat_man->push(msg,NULL);
 

abuse/trunk/src/clisp.hpp

@@ -11 +11 @@
 #ifndef SCADALISP
 int get_lprop_number(void *sybol, int def);  // returns def if symbol undefined or not number type
-
-
-void push_onto_list(void *object, void *&list);
 
 

abuse/trunk/src/imlib/jmalloc.cpp

@@ -26 +26 @@
 #define JM_SMALL_SIZE 128      // above 128 bytes is considered to be a big block and no hashing is done
 int alloc_space=ALLOC_SPACE_STATIC;
-
-extern void free_up_memory();
 
 #ifdef MEM_CHECK
@@ -776 +774 @@
     if (j_available()<min_size)
     {
-      fprintf(stderr,not_enough_total_memory_message);
+      fprintf(stderr, "%s", not_enough_total_memory_message);
       exit(0);
     }

abuse/trunk/src/innet.cpp

@@ -411 +411 @@
     if (reg==2)   // too many players
     {
-      fprintf(stderr,symbol_str("max_players"));
+      fprintf(stderr, "%s", symbol_str("max_players"));
       delete sock;
       return 0;
@@ -421 +421 @@
     if (reg && !registered)
     {
-      fprintf(stderr,symbol_str("net_not_reg"));
+      fprintf(stderr, "%s", symbol_str("net_not_reg"));
       delete sock; 
       return 0;
@@ -428 +428 @@
     if (!reg && registered)
     {
-      fprintf(stderr,symbol_str("server_not_reg"));
+      fprintf(stderr, "%s", symbol_str("server_not_reg"));
       delete sock;
       return 0;

abuse/trunk/src/lisp.cpp

@@ -48 +48 @@
 int space_size[4],print_level=0,trace_level=0,trace_print_level=1000;
 int total_user_functions;
-
-void lprint(void *i);
 
 int current_space;  // normally set to TMP_SPACE, unless compiling or other needs 
@@ -1465 +1463 @@
     dprintf("\n");
 }
-
-void *eval(void *prog);
 
 void *eval_sys_function(lisp_sys_function *fun, void *arg_list);

abuse/trunk/src/menu.cpp

@@ -118 +118 @@
   return NULL;
 }
-
-void main_menu();
 
 int menu(void *args, JCFont *font)             // reurns -1 on esc

abuse/trunk/src/nfserver.hpp

@@ -26 +26 @@
 bFILE *open_nfs_file(char const *filename, char const *mode);
 
-int net_init(int argc, char **argv);
 int NF_open_file(char const *filename, char const *mode);
 long NF_close(int fd);