gcc 3.0 warnings

ps/common.h

@@ -244,11 +244,11 @@ extern void reset_global(void);
 
 /* global.c */
 extern int             all_processes;
-extern char           *bsd_j_format;
-extern char           *bsd_l_format;
-extern char           *bsd_s_format;
-extern char           *bsd_u_format;
-extern char           *bsd_v_format;
+extern const char     *bsd_j_format;
+extern const char     *bsd_l_format;
+extern const char     *bsd_s_format;
+extern const char     *bsd_u_format;
+extern const char     *bsd_v_format;
 extern int             bsd_c_option;
 extern int             bsd_e_option;
 extern uid_t           cached_euid;
@@ -274,10 +274,10 @@ extern unsigned long   seconds_since_boot;
 extern selection_node *selection_list;
 extern unsigned        simple_select;
 extern sort_node      *sort_list;
-extern char           *sysv_f_format;
-extern char           *sysv_fl_format;
-extern char           *sysv_j_format;
-extern char           *sysv_l_format;
+extern const char     *sysv_f_format;
+extern const char     *sysv_fl_format;
+extern const char     *sysv_j_format;
+extern const char     *sysv_l_format;
 extern int             unix_f_option;
 extern int             user_is_number;
 extern int             wchan_is_number;

ps/display.c

@@ -288,7 +288,7 @@ static int compare_two_procs(const void *a, const void *b){
   sort_node *tmp_list = sort_list;
   while(tmp_list){
     int result;
-    result = (*tmp_list->sr)(*(const proc_t **)a, *(const proc_t **)b);
+    result = (*tmp_list->sr)(*(const proc_t *const*)a, *(const proc_t *const*)b);
     if(result) return (tmp_list->reverse) ? -result : result;
     tmp_list = tmp_list->next;
   }

ps/global.c

@@ -17,11 +17,7 @@
 #include <grp.h>
 #include <string.h>
 
-/*#undef __GLIBC_MINOR__
-#define __GLIBC_MINOR__ 1 */
 #include "common.h"
-/*#undef __GLIBC_MINOR__
-#define __GLIBC_MINOR__ 0 */
 
 #include <sys/sysmacros.h>
 #include "../proc/version.h"
@@ -39,14 +35,14 @@
 #endif
 
 
-static char *saved_personality_text = "You found a bug!";
+static const char * saved_personality_text = "You found a bug!";
 
 int             all_processes = -1;
-char           *bsd_j_format = (char *)0xdeadbeef;
-char           *bsd_l_format = (char *)0xdeadbeef;
-char           *bsd_s_format = (char *)0xdeadbeef;
-char           *bsd_u_format = (char *)0xdeadbeef;
-char           *bsd_v_format = (char *)0xdeadbeef;
+const char     *bsd_j_format = (const char *)0xdeadbeef;
+const char     *bsd_l_format = (const char *)0xdeadbeef;
+const char     *bsd_s_format = (const char *)0xdeadbeef;
+const char     *bsd_u_format = (const char *)0xdeadbeef;
+const char     *bsd_v_format = (const char *)0xdeadbeef;
 int             bsd_c_option = -1;
 int             bsd_e_option = -1;
 uid_t           cached_euid = -1;
@@ -71,10 +67,10 @@ unsigned long   seconds_since_boot = -1;
 selection_node *selection_list = (selection_node *)0xdeadbeef;
 unsigned        simple_select = 0xffffffff;
 sort_node      *sort_list = (sort_node *)0xdeadbeef; /* ready-to-use sort list */
-char           *sysv_f_format = (char *)0xdeadbeef;
-char           *sysv_fl_format = (char *)0xdeadbeef;
-char           *sysv_j_format = (char *)0xdeadbeef;
-char           *sysv_l_format = (char *)0xdeadbeef;
+const char     *sysv_f_format = (const char *)0xdeadbeef;
+const char     *sysv_fl_format = (const char *)0xdeadbeef;
+const char     *sysv_j_format = (const char *)0xdeadbeef;
+const char     *sysv_l_format = (const char *)0xdeadbeef;
 int             unix_f_option = -1;
 int             user_is_number = -1;
 int             wchan_is_number = -1;
@@ -142,11 +138,11 @@ typedef struct personality_table_struct {
 } personality_table_struct;
 
 static int compare_personality_table_structs(const void *a, const void *b){
-  return strcasecmp(((personality_table_struct*)a)->name,((personality_table_struct*)b)->name);
+  return strcasecmp(((const personality_table_struct*)a)->name,((const personality_table_struct*)b)->name);
 }
 
 static const char *set_personality(void){
-  char *s;
+  const char *s;
   size_t sl;
   char buf[16];
   personality_table_struct findme = { buf, NULL};

ps/output.c

@@ -833,7 +833,7 @@ static int pr_stime(void){
   struct tm *proc_time;
   struct tm *our_time;
   time_t t;
-  char *fmt;
+  const char *fmt;
   int tm_year;
   int tm_yday;
   our_time = localtime(&seconds_since_1970);   /* not reentrant */
@@ -1510,11 +1510,11 @@ void print_format_specifiers(void){
 /************ comparison functions for bsearch *************/
 
 static int compare_format_structs(const void *a, const void *b){
-  return strcmp(((format_struct*)a)->spec,((format_struct*)b)->spec);
+  return strcmp(((const format_struct*)a)->spec,((const format_struct*)b)->spec);
 }
 
 static int compare_macro_structs(const void *a, const void *b){
-  return strcmp(((macro_struct*)a)->spec,((macro_struct*)b)->spec);
+  return strcmp(((const macro_struct*)a)->spec,((const macro_struct*)b)->spec);
 }
 
 /******** look up structs as needed by the sort & format parsers ******/

ps/parser.c

@@ -713,7 +713,7 @@ typedef struct gnu_table_struct {
 } gnu_table_struct;
 
 static int compare_gnu_table_structs(const void *a, const void *b){
-  return strcmp(((gnu_table_struct*)a)->name,((gnu_table_struct*)b)->name);
+  return strcmp(((const gnu_table_struct*)a)->name,((const gnu_table_struct*)b)->name);
 }
 
 /* Option arguments are after ':', after '=', or in argv[n+1] */

ps/sortformat.c

@@ -93,7 +93,7 @@ static format_node *do_one_spec(const char *spec, const char *override){
 static void O_wrap(sf_node *sfn, int otype){
   format_node *fnode;
   format_node *endp;
-  char *trailer;
+  const char *trailer;
 
   trailer = (otype=='b') ? "END_BSD" : "END_SYS5" ;