c99 -- ugh, this is HARD

diff --git a/proc/sig.c b/proc/sig.c
index 85ec8ef0c9be8c6f541d7dc5ca02259510516e66..f2db90e70fdddacd2e69d9d3836f0488003c2d59 100644 (file)
--- a/proc/sig.c
+++ b/proc/sig.c
@@ -102,11 +102,8 @@ static int compare_signal_names(const void *a, const void *b){
 }
 
 /* return -1 on failure */
-int signal_name_to_number(char *name){
-  const mapstruct *ptr;
-  mapstruct ms;
+int signal_name_to_number(const char *restrict name){
   long val;
-  char *endp;
   int offset;
 
   /* clean up name */
@@ -117,11 +114,17 @@ int signal_name_to_number(char *name){
   if(!strcasecmp(name,"IOT")) return SIGABRT;
 
   /* search the table */
-  ms.name = name;
-  ptr = bsearch(&ms, sigtable, number_of_signals,
-     sizeof(mapstruct), compare_signal_names
-  );
-  if(ptr) return ptr->num;
+  {
+    const mapstruct ms = {name,0};
+    const mapstruct *restrict const ptr = bsearch(
+      &ms,
+      sigtable,
+      number_of_signals,
+      sizeof(mapstruct),
+      compare_signal_names
+    );
+    if(ptr) return ptr->num;
+  }
 
   if(!strcasecmp(name,"RTMIN")) return SIGRTMIN;
   if(!strcasecmp(name,"EXIT"))  return 0;
@@ -134,8 +137,11 @@ int signal_name_to_number(char *name){
   }
 
   /* not found, so try as a number */
-  val = strtol(name,&endp,10);
-  if(*endp || endp==name) return -1; /* not valid */
+  {
+    char *endp;
+    val = strtol(name,&endp,10);
+    if(*endp || endp==name) return -1; /* not valid */
+  }
   if(val+SIGRTMIN>127) return -1; /* not valid */
   return val+offset;
 }
@@ -153,7 +159,7 @@ static const char *signal_number_to_name(int signo){
   return buf;
 }
 
-int print_given_signals(int argc, char *argv[], int max_line){
+int print_given_signals(int argc, const char **argv, int max_line){
   char buf[1280]; /* 128 signals, "RTMIN+xx" is largest */
   int ret = 0;  /* to be used as exit code by caller */
   int place = 0; /* position on this line */
@@ -161,8 +167,7 @@ int print_given_signals(int argc, char *argv[], int max_line){
   if(argc > 128) return 1;
   while(argc--){
     char tmpbuf[16];
-    char *txt; /* convenient alias */
-    txt = *argv;
+    const char *restrict const txt = *argv;
     if(*txt >= '0' && *txt <= '9'){
       long val;
       char *endp;

diff --git a/proc/sig.h b/proc/sig.h
index 3f232c57b1d326782ee1ac56293f456ec38e7bb5..412093a3ef5baeb7128446a73575809afe42c25e 100644 (file)
--- a/proc/sig.h
+++ b/proc/sig.h
@@ -9,10 +9,12 @@
  * GNU Library General Public License for more details.
  */
 
+#include "procps.h"
+
 /* return -1 on failure */
-extern int signal_name_to_number(char *name);
+extern int signal_name_to_number(const char *restrict name);
 
-extern int print_given_signals(int argc, char *argv[], int max_line);
+extern int print_given_signals(int argc,  const char **argv, int max_line);
 
 extern void pretty_print_signals(void);
 

diff --git a/skill.c b/skill.c
index a150f202fb6b7ec32131249e69a5a8f298c66c1a..dbd9ac0ce56923d549d55e6d2aa91e5c99dd0a8c 100644 (file)
--- a/skill.c
+++ b/skill.c
@@ -42,7 +42,6 @@ thing##s[thing##_count++] = addme; \
 
 static int my_pid;
 static int saved_argc;
-static char **saved_argv;
 
 static int sig_or_pri;
 
@@ -245,7 +244,7 @@ static void kill_usage(void){
 }
 
 /***** kill */
-static void kill_main(int argc, const char *restrict argv[]){
+static void kill_main(int argc, const char *restrict const *restrict argv){
   const char *sigptr;
   int signo = SIGTERM;
   int exitvalue = 0;
@@ -368,12 +367,12 @@ static void _skillsnice_usage(int line){
 
 /***** common skill/snice argument parsing code */
 #define NO_PRI_VAL ((int)0xdeafbeef)
-static void skillsnice_parse(int argc, char *argv[]){
+static void skillsnice_parse(int argc, const char *restrict const *restrict argv){
   int signo = -1;
   int prino = NO_PRI_VAL;
   int force = 0;
   int num_found = 0;
-  char *argptr;
+  const char *restrict argptr;
   if(argc<2) skillsnice_usage();
   if(argc==2 && argv[1][0]=='-'){
     if(!strcmp(argv[1],"-L")){
@@ -539,7 +538,6 @@ selection_collection:
 int main(int argc, char *argv[]){
   char *tmpstr;
   my_pid = getpid();
-  saved_argv = argv;
   saved_argc = argc;
   if(!argc){
     fprintf(stderr,"ERROR: could not determine own name.\n");

diff --git a/sysctl.c b/sysctl.c
index 946bc3b28b84bae830bdc77d62de25279ffdd76c..ad2a5d368606314f4c8311bb32ed61eafb7316d1 100644 (file)
--- a/sysctl.c
+++ b/sysctl.c
@@ -26,6 +26,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <errno.h>
+#include "proc/procps.h"
 
 /*
  *    Additional types we might need.

diff --git a/top.c b/top.c
index 86d3335ffbb8728239d9761be1450138544fa95c..91d23d23f05d4e31f07ccae0322c74469e890fc8 100644 (file)
--- a/top.c
+++ b/top.c
@@ -781,7 +781,8 @@ static const char *scale_tics (TICS_t tics, const int width)
          * Handle our own memory stuff without the risk of leaving the
          * user's terminal in an ugly state should things go sour. */
 
-static void *alloc_c (unsigned numb) MALLOC
+static void *alloc_c (unsigned numb) MALLOC;
+static void *alloc_c (unsigned numb)
 {
    void * p;
 
@@ -791,8 +792,8 @@ static void *alloc_c (unsigned numb) MALLOC
    return p;
 }
 
-
-static void *alloc_r (void *q, unsigned numb) MALLOC
+static void *alloc_r (void *q, unsigned numb) MALLOC;
+static void *alloc_r (void *q, unsigned numb)
 {
    void *p;
 

diff --git a/vmstat.c b/vmstat.c
index 32ec76b6b66b6d201eebd4af7968c45eb2cea6ec..fa536f75c30f1bfad1994ed251570107e6392025 100644 (file)
--- a/vmstat.c
+++ b/vmstat.c
@@ -54,7 +54,7 @@ static void crash(const char *filename) {
 
 ////////////////////////////////////////////////////////////////////////
 
-static void getrunners(unsigned int *restirct running, unsigned int *restrict blocked) {
+static void getrunners(unsigned int *restrict running, unsigned int *restrict blocked) {
   static struct direct *ent;
   DIR *proc;