Changeset 39 for abuse/trunk/src/includeTweet

Timestamp:

Mar 2, 2008, 12:29:06 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Fix almost 2,000 warnings by using proper "const" keywords where needed.

Location:

abuse/trunk/src/include

Files:

• ability.hpp (modified) (1 diff)
• cache.hpp (modified) (4 diffs)
• chars.hpp (modified) (3 diffs)
• config.hpp (modified) (1 diff)
• console.hpp (modified) (3 diffs)
• dev.hpp (modified) (2 diffs)
• extend.hpp (modified) (1 diff)
• game.hpp (modified) (3 diffs)
• gui.hpp (modified) (1 diff)
• items.hpp (modified) (1 diff)
• language.hpp (modified) (1 diff)
• level.hpp (modified) (1 diff)
• light.hpp (modified) (1 diff)
• lisp.hpp (modified) (4 diffs)
• lisp2.hpp (modified) (1 diff)
• loadgame.hpp (modified) (1 diff)
• netcfg.hpp (modified) (1 diff)
• nfserver.hpp (modified) (2 diffs)
• objects.hpp (modified) (1 diff)
• property.hpp (modified) (1 diff)
• specache.hpp (modified) (2 diffs)
• view.hpp (modified) (1 diff)

abuse/trunk/src/include/ability.hpp

@@ -17 +17 @@
 
 #define TOTAL_ABILITIES (walk_top_speed+1)
-extern char *ability_names[TOTAL_ABILITIES];
+extern char const *ability_names[TOTAL_ABILITIES];
 long get_ability(int who, ability a);
 long get_ability_default(ability a);

abuse/trunk/src/include/cache.hpp

@@ -37 +37 @@
   uint32_t crc;
   char *filename;
-  crced_file(char *name);
+  crced_file(char const *name);
   ~crced_file();
 } ;
@@ -47 +47 @@
   public :
   crc_manager();
-  int get_filenumber(char *filename);
+  int get_filenumber(char const *filename);
   uint32_t get_crc(int32_t filenumber, int &failed);
   void set_crc(int32_t filenumber, uint32_t crc);
@@ -53 +53 @@
   void clean_up();
   int total_filenames() { return total_files; }
-  int write_crc_file(char *filename);
-  int load_crc_file(char *filename);
+  int write_crc_file(char const *filename);
+  int load_crc_file(char const *filename);
 } ;
 
@@ -87 +87 @@
   int in_use() { if (used) { used=0; return 1; } else return 0; }
   int full() { if (ful) { ful=0; return 1; } else return 0; }
-  int32_t reg_object(char *filename, void *object, int type, int rm_dups);      // lisp object
-  int32_t reg(char *filename, char *name, int type=-1, int rm_dups=0);          // returns id to item
+  int32_t reg_object(char const *filename, void *object, int type, int rm_dups);      // lisp object
+  int32_t reg(char const *filename, char const *name, int type=-1, int rm_dups=0);          // returns id to item
   int32_t reg_lisp_block(Cell *block);
   int loaded(int id);

abuse/trunk/src/include/chars.hpp

@@ -24 +24 @@
 
 #define MAX_STATE (running+1)
-extern char *state_names[];
+extern char const *state_names[];
 
 class named_field
@@ -55 +55 @@
                                   // then objects will not draw a damage when hitting it
      };
-extern char *cflag_names[TOTAL_CFLAGS];
+extern char const *cflag_names[TOTAL_CFLAGS];
 
 // all object functions default to NULL
@@ -71 +71 @@
        OFUN_CHANGE_TYPE
      } ;
-extern char *ofun_names[TOTAL_OFUNS];
+extern char const *ofun_names[TOTAL_OFUNS];
 
 

abuse/trunk/src/include/config.hpp

@@ -12 +12 @@
 void get_movement(int player, int &x, int &y, int &b1, int &b2, int &b3, int &b4);
 void config_cleanup();  // free any memory allocated
-int get_keycode(char *str);  // -1 means not a valid key code
+int get_keycode(char const *str);  // -1 means not a valid key code
 
 #endif

abuse/trunk/src/include/console.hpp

@@ -14 +14 @@
   public :
 
-  console(window_manager *WM, JCFont *font, int width, int height, char *Name);
+  console(window_manager *WM, JCFont *font, int width, int height, char const *Name);
   int showing() { return con_win!=NULL; }
   void show();
@@ -26 +26 @@
   int wy() { return con_win->y1(); }
   void draw_cursor();
-  void put_string(char *st);
+  void put_string(char const *st);
   void draw_char(int x, int y, char ch);
   void toggle() { if (con_win) hide(); else show(); }
-  void print_f(const char *format, ...);
+  void print_f(char const *format, ...);
   ~console();
 } ;
@@ -37 +37 @@
   char shcmd[300];
   public :
-  shell_term(window_manager *WM, JCFont *font, int width, int height, char *Name);
+  shell_term(window_manager *WM, JCFont *font, int width, int height, char const *Name);
   virtual ~shell_term() {};
   int handle_event(event &ev, window_manager *wm);
   virtual void prompt();
-  virtual void execute(char *st);
+  virtual void execute(char const *st);
 } ;
 

abuse/trunk/src/include/dev.hpp

@@ -15 +15 @@
 void dev_cleanup();
 void toggle_edit_mode();
-char *symbol_str(char *name);
+char const *symbol_str(char const *name);
 
 class pal_win
@@ -85 +85 @@
   void toggle_light_window();
   void toggle_search_window();
-  void show_char_mem(char *name);
+  void show_char_mem(char const *name);
   void close_oedit_window();
   void show_mem();
   dev_controll();
   void handle_event(event &ev);
-  void do_command(char *st, event &ev);
+  void do_command(char const *st, event &ev);
   int is_pal_win(jwindow *win);
   void dev_draw(view *v);

abuse/trunk/src/include/extend.hpp

@@ -41 +41 @@
   morph_char *mc;
   int total_vars();
-  char *var_name(int x);
-  int   var_type(int x);
+  char const *var_name(int x);
+  int var_type(int x);
   void set_var(int x, uint32_t v);
   int32_t get_var(int x);

abuse/trunk/src/include/game.hpp

@@ -50 +50 @@
 extern int demo_start,idle_ticks;
 
+extern FILE *open_FILE(char const *filename, char const *mode);
+
 class game
 {
@@ -80 +82 @@
   game(int argc, char **argv);
   void step();
-  void show_help(char *st);
+  void show_help(char const *st);
   void draw_value(image *screen, int x, int y, int w, int h, int val, int max);
   unsigned char get_color(int x) { return x; }
@@ -120 +122 @@
 
   int in_area(event &ev, int x1, int y1, int x2, int y2);
-  void load_level(char *name);
+  void load_level(char const *name);
   void set_level(level *nl);
   void show_time();

abuse/trunk/src/include/gui.hpp

@@ -10 +10 @@
   char key[16];
 public : 
-  ico_button(int X, int Y, int ID, int Up, int down, int upa, int downa, ifield *Next, int act_id=-1, char *help_key=NULL);
+  ico_button(int X, int Y, int ID, int Up, int down, int upa, int downa, ifield *Next, int act_id=-1, char const *help_key=NULL);
 
   virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);

abuse/trunk/src/include/items.hpp

@@ -14 +14 @@
 {
 public :  
-  boundary(bFILE *fp,char *er_name);
+  boundary(bFILE *fp,char const *er_name);
   uint8_t *inside;     // tells which side of the line is on the inside
   boundary(boundary *p);      // flips the *inside list

abuse/trunk/src/include/language.hpp

@@ -1 @@
-char *lang_string(char *symbol);
+char const *lang_string(char const *symbol);

abuse/trunk/src/include/level.hpp

@@ -85 +85 @@
   uint16_t background_height() { return bg_height; }
   int load_failed() { return map_fg==NULL; } 
-  level(spec_directory *sd, bFILE *fp, char *lev_name);
+  level(spec_directory *sd, bFILE *fp, char const *lev_name);
   void load_fail();             
-  level(int width, int height, char *name);  
-  int save(char *filename, int save_all);  // save_all includes player and view information (1 = success)
-  void set_name(char *name) { Name=strcpy((char *)jrealloc(Name,strlen(name)+1,"map name"),name); }
+  level(int width, int height, char const *name);  
+  int save(char const *filename, int save_all);  // save_all includes player and view information (1 = success)
+  void set_name(char const *name) { Name=strcpy((char *)jrealloc(Name,strlen(name)+1,"map name"),name); }
   void set_size(int w, int h);
   void remove_light(light_source *which);

abuse/trunk/src/include/light.hpp

@@ -55 +55 @@
                                int32_t inner, int32_t outer, int32_t xshift, int32_t yshift);
 
-void add_light_spec(spec_directory *sd, char *level_name);
+void add_light_spec(spec_directory *sd, char const *level_name);
 void write_lights(bFILE *fp);
-void read_lights(spec_directory *sd, bFILE *fp, char *level_name);
+void read_lights(spec_directory *sd, bFILE *fp, char const *level_name);
 
 

abuse/trunk/src/include/lisp.hpp

@@ -139 +139 @@
 void *lisp_eq(void *n1, void *n2);
 void *lisp_equal(void *n1, void *n2);
-lisp_symbol *find_symbol(char *name);
+lisp_symbol *find_symbol(char const *name);
 long list_length(void *i);
 void lprint(void *i);
@@ -146 +146 @@
 void *eval_function(lisp_symbol *sym, void *arg_list);
 void *eval_user_fun(lisp_symbol *sym, void *arg_list);
-void *compile(char *&s);
+void *compile(char const *&s);
 void *symbol_value(void *symbol);
 void *symbol_function(void *symbol);
@@ -155 +155 @@
 void resize_tmp(int new_size);
 void resize_perm(int new_size);
-lisp_symbol *make_find_symbol(char *name);
+lisp_symbol *make_find_symbol(char const *name);
 
 void push_onto_list(void *object, void *&list);
 lisp_symbol *add_c_object(void *symbol, int16_t number);
-lisp_symbol *add_c_function(char *name, short min_args, short max_args, short number);
-lisp_symbol *add_c_bool_fun(char *name, short min_args, short max_args, short number);
-lisp_symbol *add_lisp_function(char *name, short min_args, short max_args, short number);
+lisp_symbol *add_c_function(char const *name, short min_args, short max_args, short number);
+lisp_symbol *add_c_bool_fun(char const *name, short min_args, short max_args, short number);
+lisp_symbol *add_lisp_function(char const *name, short min_args, short max_args, short number);
 int read_ltoken(char *&s, char *buffer);
 cons_cell *new_cons_cell();
@@ -170 +170 @@
 lisp_pointer *new_lisp_pointer(void *addr);
 lisp_character *new_lisp_character(uint16_t ch);
-lisp_string *new_lisp_string(char *string);
-lisp_string *new_lisp_string(char *string, int length);
+lisp_string *new_lisp_string(char const *string);
+lisp_string *new_lisp_string(char const *string, int length);
 lisp_string *new_lisp_string(int length);
 lisp_fixed_point *new_lisp_fixed_point(int32_t x);

abuse/trunk/src/include/lisp2.hpp

@@ -82 +82 @@
 void lisp_init (long a, long b);
 void lisp_uninit (void);
-char* lstring_value (void* x);
+char * lstring_value (void* x);
 long lnumber_value (void* x);
 char lcharacter_value (void* x);

abuse/trunk/src/include/loadgame.hpp

@@ -3 +3 @@
 
 int show_load_icon();
-int load_game(int show_all, char *title);
+int load_game(int show_all, char const *title);
 void get_savegame_name(char *buf);  // buf should be at least 50 bytes
 void last_savegame_name(char *buf);

abuse/trunk/src/include/netcfg.hpp

@@ -24 +24 @@
   net_configuration();
   int input();   // pulls up dialog box and input fileds
-  void cfg_error(char *msg);
+  void cfg_error(char const *msg);
   int confirm_inputs(jwindow *j, int server);
-  void error(char *message);
+  void error(char const *message);
   int confirm_inputs(input_manager *i, int server);
   ifield *center_ifield(ifield *i,int x1, int x2, ifield *place_below);

abuse/trunk/src/include/nfserver.hpp

@@ -15 +15 @@
 
 int net_start();
-bFILE *open_nfs_file(char *filename,char *mode);
+bFILE *open_nfs_file(char const *filename, char const *mode);
 
 int net_init(int argc, char **argv);
-int NF_open_file(char *filename, char *mode);
+int NF_open_file(char const *filename, char const *mode);
 long NF_close(int fd);
 long NF_read(int fd, void *buf, long size);
@@ -30 +30 @@
 void net_reload();
 void read_new_views();
-int set_file_server(char *name);
+int set_file_server(char const *name);
 int set_file_server(net_address *addr);
 

abuse/trunk/src/include/objects.hpp

@@ -37 +37 @@
 
 #define TOTAL_OBJECT_VARS 28
-struct obj_desc { char *name; int type; } ;
+struct obj_desc { char const *name; int type; } ;
 extern obj_desc object_descriptions[TOTAL_OBJECT_VARS];
 int RC_type_size(int type);

abuse/trunk/src/include/property.hpp

@@ -6 +6 @@
 {
   property *first;
-  property *find(char *name);
+  property *find(char const *name);
   public :
   property_manager() { first=0; } 
-  void load(char *filename);
-  void save(char *filename);
+  void load(char const *filename);
+  void save(char const *filename);
   
-  int getd(char *name, int def) { return (int)get(name,def); }
-  int get(char *name, int def);
-  char  *get(char *name, char *def);
+  int getd(char const *name, int def) { return (int)get(name,def); }
+  int get(char const *name, int def);
+  char const *get(char const *name, char const *def);
 
-  void setd(char *name, int def) { set(name,def); }
-  void set(char *name, double def);
-  void set(char *name, char *def);
+  void setd(char const *name, int def) { set(name,def); }
+  void set(char const *name, double def);
+  void set(char const *name, char const *def);
   ~property_manager();
 } ;

abuse/trunk/src/include/specache.hpp

@@ -14 +14 @@
     spec_directory *sd;
     char *filename() { return fn; }
-    filename_node(char *filename, spec_directory *dir)
+    filename_node(char const *filename, spec_directory *dir)
     {
       fn=(char *)memcpy(jmalloc(strlen(filename)+1,"spec_dir cache"),filename,strlen(filename)+1);
@@ -25 +25 @@
   long size;
   public :
-  spec_directory *get_spec_directory(char *filename, bFILE *fp=NULL);
+  spec_directory *get_spec_directory(char const *filename, bFILE *fp=NULL);
   spec_directory_cache() { fn_root=0; size=0; }
   void clear();                             // frees up all allocated memory

abuse/trunk/src/include/view.hpp

@@ -119 +119 @@
 object_node *make_player_onodes(int player_num=-1);
 int total_view_vars();
-char *get_view_var_name(int num);
+char const *get_view_var_name(int num);
 ushort make_sync();