ANSIfy function declarations

1 files changed, 155 insertions, 165 deletions

diff --git a/process.c b/process.c
index e7e0806..75ef753 100644
--- a/process.c
+++ b/process.c
@@ -51,8 +51,8 @@ typedef struct _AuthList {		/* linked list of entries */
 
 #define add_to_list(h,t,e) {if (t) (t)->next = (e); else (h) = (e); (t) = (e);}
 
-typedef int (*ProcessFunc)(char *, int, int, char **);
-typedef int (*DoFunc)(char *, int, IceAuthFileEntry *, char *);
+typedef int (*ProcessFunc)(const char *, int, int, char **);
+typedef int (*DoFunc)(const char *, int, IceAuthFileEntry *, char *);
 
 typedef struct _CommandTable {		/* commands that are understood */
     char *name;				/* full name */
@@ -83,38 +83,38 @@ static char *stdout_filename = "(stdout)";  /* for messages */
 static char *Yes = "yes";		/* for messages */
 static char *No = "no";			/* for messages */
 
-static int binaryEqual ( char *a, char *b, unsigned len );
-static void prefix ( char *fn, int n );
-static void badcommandline ( char *cmd );
+static int binaryEqual ( const char *a, const char *b, unsigned len );
+static void prefix ( const char *fn, int n );
+static void badcommandline ( const char *cmd );
 static char *skip_space ( char *s );
 static char *skip_nonspace ( char *s );
 static char **split_into_words ( char *src, int *argcp );
-static FILE *open_file ( char **filenamep, char *mode, Bool *usedstdp, char *srcfn, int srcln, char *cmd );
+static FILE *open_file ( char **filenamep, const char *mode, Bool *usedstdp, const char *srcfn, int srcln, const char *cmd );
 static int read_auth_entries ( FILE *fp, AuthList **headp, AuthList **tailp );
 static int cvthexkey ( char *hexstr, char **ptrp );
-static int dispatch_command ( char *inputfilename, int lineno, int argc, char **argv, CommandTable *tab, int *statusp );
+static int dispatch_command ( const char *inputfilename, int lineno, int argc, char **argv, CommandTable *tab, int *statusp );
 static void die ( int sig );
 static void catchsig ( int sig );
 static void register_signals ( void );
 static int write_auth_file ( char *tmp_nam, size_t tmp_nam_len );
-static void fprintfhex ( FILE *fp, unsigned int len, char *cp );
-static int dump_entry ( char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
-static int extract_entry ( char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
+static void fprintfhex ( FILE *fp, unsigned int len, const char *cp );
+static int dump_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
+static int extract_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
 static int match_auth ( IceAuthFileEntry *a, IceAuthFileEntry *b, int *authDataSame );
 static int merge_entries ( AuthList **firstp, AuthList *second, int *nnewp, int *nreplp, int *ndupp );
-static int search_and_do ( char *inputfilename, int lineno, int start, int argc, char *argv[], DoFunc do_func, char *data );
-static int remove_entry ( char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
-static int do_help ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_questionmark ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_list ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_merge ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_extract ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_add ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_remove ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_info ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_exit ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_quit ( char *inputfilename, int lineno, int argc, char **argv );
-static int do_source ( char *inputfilename, int lineno, int argc, char **argv );
+static int search_and_do ( const char *inputfilename, int lineno, int start, int argc, char *argv[], DoFunc do_func, char *data );
+static int remove_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
+static int do_help ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_questionmark ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_list ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_merge ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_extract ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_add ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_remove ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_info ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_exit ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_quit ( const char *inputfilename, int lineno, int argc, char **argv );
+static int do_source ( const char *inputfilename, int lineno, int argc, char **argv );
 
 static CommandTable command_table[] = {	/* table of known commands */
 { "add", 2, 3, do_add,
@@ -232,10 +232,10 @@ static mode_t original_umask = 0;	/* for restoring */
 #define copystring(s)	( s != NULL ? strdup(s) : NULL )
 
 static int
-binaryEqual (a, b, len)
-
-register char		*a, *b;
-register unsigned	len;
+binaryEqual (
+    register const char	*a,
+    register const char	*b,
+    register unsigned	len)
 
 {
     while (len--)
@@ -244,21 +244,17 @@ register unsigned	len;
     return 1;
 }
 
-static void prefix (fn, n)
-    char *fn;
-    int n;
+static void prefix (const char *fn, int n)
 {
     fprintf (stderr, "%s: %s:%d:  ", ProgramName, fn, n);
 }
 
-static void badcommandline (cmd)
-    char *cmd;
+static void badcommandline (const char *cmd)
 {
     fprintf (stderr, "bad \"%s\" command line\n", cmd);
 }
 
-static char *skip_space (s)
-    register char *s;
+static char *skip_space (register char *s)
 {
     if (!s) return NULL;
 
@@ -268,8 +264,7 @@ static char *skip_space (s)
 }
 
 
-static char *skip_nonspace (s)
-    register char *s;
+static char *skip_nonspace (register char *s)
 {
     if (!s) return NULL;
 
@@ -279,9 +274,9 @@ static char *skip_nonspace (s)
     return s;
 }
 
-static char **split_into_words (src, argcp)  /* argvify string */
-    char *src;
-    int *argcp;
+static char **split_into_words (  /* argvify string */
+    char *src,
+    int *argcp)
 {
     char *jword;
     char savec;
@@ -321,13 +316,13 @@ static char **split_into_words (src, argcp)  /* argvify string */
 }
 
 
-static FILE *open_file (filenamep, mode, usedstdp, srcfn, srcln, cmd)
-    char **filenamep;
-    char *mode;
-    Bool *usedstdp;
-    char *srcfn;
-    int srcln;
-    char *cmd;
+static FILE *open_file (
+    char **filenamep,
+    const char *mode,
+    Bool *usedstdp,
+    const char *srcfn,
+    int srcln,
+    const char *cmd)
 {
     FILE *fp;
 
@@ -359,9 +354,7 @@ static FILE *open_file (filenamep, mode, usedstdp, srcfn, srcln, cmd)
 }
 
 
-static int read_auth_entries (fp, headp, tailp)
-    FILE *fp;
-    AuthList **headp, **tailp;
+static int read_auth_entries (FILE *fp, AuthList **headp, AuthList **tailp)
 {
     IceAuthFileEntry *auth;
     AuthList *head, *tail;
@@ -393,9 +386,9 @@ static int read_auth_entries (fp, headp, tailp)
 }
 
 
-static int cvthexkey (hexstr, ptrp)	/* turn hex key string into octets */
-    char *hexstr;
-    char **ptrp;
+static int cvthexkey (	/* turn hex key string into octets */
+    char *hexstr,
+    char **ptrp)
 {
     int i;
     int len = 0;
@@ -445,13 +438,13 @@ static int cvthexkey (hexstr, ptrp)	/* turn hex key string into octets */
     return len;
 }
 
-static int dispatch_command (inputfilename, lineno, argc, argv, tab, statusp)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
-    CommandTable *tab;
-    int *statusp;
+static int dispatch_command (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv,
+    CommandTable *tab,
+    int *statusp)
 {
     CommandTable *ct;
     char *cmd;
@@ -494,8 +487,7 @@ static volatile Bool dieing = False;
 #define WRITES(fd, S) (void)write((fd), (S), strlen((S)))
 
 /* ARGSUSED */
-static _signal_t die (sig)
-    int sig;
+static _signal_t die (int sig)
 {
     dieing = True;
     _exit (auth_finalize ());
@@ -505,8 +497,7 @@ static _signal_t die (sig)
 #endif
 }
 
-static _signal_t catchsig (sig)
-    int sig;
+static _signal_t catchsig (int sig)
 {
 #ifdef SYSV
     if (sig > 0) signal (sig, die);	/* re-establish signal handler */
@@ -527,7 +518,7 @@ static _signal_t catchsig (sig)
 #endif
 }
 
-static void register_signals ()
+static void register_signals (void)
 {
     signal (SIGINT, catchsig);
     signal (SIGTERM, catchsig);
@@ -542,8 +533,7 @@ static void register_signals ()
  * public procedures for parsing lines of input
  */
 
-int auth_initialize (authfilename)
-    char *authfilename;
+int auth_initialize ( char *authfilename )
 {
     int n;
     AuthList *head, *tail;
@@ -672,7 +662,7 @@ static int write_auth_file (char *tmp_nam, size_t tmp_nam_len)
     return 0;
 }
 
-int auth_finalize ()
+int auth_finalize (void)
 {
     char temp_name[1024];			/* large filename size */
 
@@ -734,11 +724,11 @@ int auth_finalize ()
     return 0;
 }
 
-int process_command (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+int process_command (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     int status;
 
@@ -758,12 +748,12 @@ int process_command (inputfilename, lineno, argc, argv)
  * utility routines
  */
 
-static void fprintfhex (fp, len, cp)
-    register FILE *fp;
-    unsigned int len;
-    char *cp;
+static void fprintfhex (
+    register FILE *fp,
+    unsigned int len,
+    const char *cp)
 {
-    unsigned char *ucp = (unsigned char *) cp;
+    const unsigned char *ucp = (const unsigned char *) cp;
 
     for (; len > 0; len--, ucp++) {
 	register char *s = hex_table[*ucp];
@@ -774,11 +764,11 @@ static void fprintfhex (fp, len, cp)
 }
 
 /* ARGSUSED */
-static int dump_entry (inputfilename, lineno, auth, data)
-    char *inputfilename;
-    int lineno;
-    IceAuthFileEntry *auth;
-    char *data;
+static int dump_entry (
+    const char *inputfilename,
+    int lineno,
+    IceAuthFileEntry *auth,
+    char *data)
 {
     struct _list_data *ld = (struct _list_data *) data;
     FILE *fp = ld->fp;
@@ -807,11 +797,11 @@ static int dump_entry (inputfilename, lineno, auth, data)
     return 0;
 }
 
-static int extract_entry (inputfilename, lineno, auth, data)
-    char *inputfilename;
-    int lineno;
-    IceAuthFileEntry *auth;
-    char *data;
+static int extract_entry (
+    const char *inputfilename,
+    int lineno,
+    IceAuthFileEntry *auth,
+    char *data)
 {
     struct _extract_data *ed = (struct _extract_data *) data;
 
@@ -834,9 +824,10 @@ static int extract_entry (inputfilename, lineno, auth, data)
 }
 
 
-static int match_auth (a, b, authDataSame)
-    register IceAuthFileEntry *a, *b;
-    int *authDataSame;
+static int match_auth (
+    register IceAuthFileEntry *a,
+    register IceAuthFileEntry *b,
+    int *authDataSame)
 {
     int match = strcmp (a->protocol_name, b->protocol_name) == 0 &&
 	    strcmp (a->network_id, b->network_id) == 0 &&
@@ -854,9 +845,9 @@ static int match_auth (a, b, authDataSame)
 }
 
 
-static int merge_entries (firstp, second, nnewp, nreplp, ndupp)
-    AuthList **firstp, *second;
-    int *nnewp, *nreplp, *ndupp;
+static int merge_entries (
+    AuthList **firstp, AuthList *second,
+    int *nnewp, int *nreplp, int *ndupp)
 {
     AuthList *a, *b, *first, *tail;
     int n = 0, nnew = 0, nrepl = 0, ndup = 0;
@@ -942,15 +933,14 @@ static int merge_entries (firstp, second, nnewp, nreplp, ndupp)
 }
 
 
-static int search_and_do (inputfilename, lineno, start,
-		    argc, argv, do_func, data)
-    char *inputfilename;
-    int lineno;
-    int start;
-    int argc;
-    char *argv[];
-    DoFunc do_func;
-    char *data;
+static int search_and_do (
+    const char *inputfilename,
+    int lineno,
+    int start,
+    int argc,
+    char *argv[],
+    DoFunc do_func,
+    char *data)
 {
     int i;
     int status = 0;
@@ -1008,11 +998,11 @@ static int search_and_do (inputfilename, lineno, start,
 
 
 /* ARGSUSED */
-static int remove_entry (inputfilename, lineno, auth, data)
-    char *inputfilename;
-    int lineno;
-    IceAuthFileEntry *auth;
-    char *data;
+static int remove_entry (
+    const char *inputfilename,
+    int lineno,
+    IceAuthFileEntry *auth,
+    char *data)
 {
     int *nremovedp = (int *) data;
     AuthList **listp = &iceauth_head;
@@ -1038,9 +1028,9 @@ static int remove_entry (inputfilename, lineno, auth, data)
 /*
  * help
  */
-int print_help (fp, cmd)
-    FILE *fp;
-    char *cmd;
+int print_help (
+    FILE *fp,
+    const char *cmd)
 {
     CommandTable *ct;
     int n = 0;
@@ -1064,11 +1054,11 @@ int print_help (fp, cmd)
     return n;
 }
 
-static int do_help (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_help (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     char *cmd = (argc > 1 ? argv[1] : NULL);
     int n;
@@ -1098,11 +1088,11 @@ static int do_help (inputfilename, lineno, argc, argv)
  * questionmark
  */
 /* ARGSUSED */
-static int do_questionmark (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_questionmark (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     CommandTable *ct;
     int i;
@@ -1136,11 +1126,11 @@ static int do_questionmark (inputfilename, lineno, argc, argv)
 /*
  * list [displayname ...]
  */
-static int do_list (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_list (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     struct _list_data ld;
 
@@ -1166,11 +1156,11 @@ static int do_list (inputfilename, lineno, argc, argv)
 /*
  * merge filename [filename ...]
  */
-static int do_merge (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_merge (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     int i;
     int errors = 0;
@@ -1230,11 +1220,11 @@ static int do_merge (inputfilename, lineno, argc, argv)
 /*
  * extract filename displayname [displayname ...]
  */
-static int do_extract (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_extract (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     int errors;
     struct _extract_data ed;
@@ -1274,11 +1264,11 @@ static int do_extract (inputfilename, lineno, argc, argv)
 /*
  * add protoname protodata netid authname authdata
  */
-static int do_add (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_add (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 { 
     int n, nnew, nrepl, ndup;
     char *protoname;
@@ -1456,11 +1446,11 @@ cant_add:
 /*
  * remove displayname
  */
-static int do_remove (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_remove (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     int nremoved = 0;
     int errors;
@@ -1480,11 +1470,11 @@ static int do_remove (inputfilename, lineno, argc, argv)
 /*
  * info
  */
-static int do_info (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_info (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     int n;
     AuthList *l;
@@ -1515,11 +1505,11 @@ static int do_info (inputfilename, lineno, argc, argv)
 static Bool alldone = False;
 
 /* ARGSUSED */
-static int do_exit (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_exit (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     /* allow bogus stuff */
     alldone = True;
@@ -1530,11 +1520,11 @@ static int do_exit (inputfilename, lineno, argc, argv)
  * quit
  */
 /* ARGSUSED */
-static int do_quit (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_quit (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     /* allow bogus stuff */
     die (0);
@@ -1546,11 +1536,11 @@ static int do_quit (inputfilename, lineno, argc, argv)
 /*
  * source filename
  */
-static int do_source (inputfilename, lineno, argc, argv)
-    char *inputfilename;
-    int lineno;
-    int argc;
-    char **argv;
+static int do_source (
+    const char *inputfilename,
+    int lineno,
+    int argc,
+    char **argv)
 {
     char *script;
     char buf[BUFSIZ];