utils/lookup*.c: constify the API

extern int Lookup(const char *str, const char * const *table);
extern int LookupAny(char, const char * const *);
extern int LookupFull(const char *, const char **);
extern int LookupStruct(const char *str, const LookupTable *table_start, int size);
extern int LookupStructFull(const char *str, const char * const *table, int size);

utils/lookup.c

@@ -56,8 +56,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
 
 int
 Lookup(str, table)
-char *str;			/* Pointer to a string to be looked up */
+const char *str;		/* Pointer to a string to be looked up */
-char *(table[]);		/* Pointer to an array of string pointers
+const char * const *table;	/* Pointer to an array of string pointers
 				 * which are the valid commands.
 				 * The end of
 				 * the table is indicated by a NULL string.
@@ -68,7 +68,7 @@ char *(table[]);		/* Pointer to an array of string pointers
     int ststart = 0;
 
 #ifdef MAGIC_WRAPPER
-    static char *namespace = "::magic::";
+    static const char *namespace = "::magic::";
 
     /* Skip over prefix of qualified namespaces "::magic::" and "magic::" */
     for (pos = 0; pos < 9; pos++)
@@ -85,8 +85,8 @@ char *(table[]);		/* Pointer to an array of string pointers
     /* search for match */
     for(pos=0; table[pos]!=NULL; pos++)
     {
-	char *tabc = table[pos];
+	const char *tabc = table[pos];
-	char *strc = &(str[ststart]);
+	const char *strc = &(str[ststart]);
 	while(*strc!='\0' && *tabc!=' ' &&
 	    ((*tabc==*strc) ||
 	     (isupper(*tabc) && islower(*strc) && (tolower(*tabc)== *strc))||
@@ -136,7 +136,7 @@ char *(table[]);		/* Pointer to an array of string pointers
  *
  *	struct
  *	{
- *		char *string;
+ *		const char *string;
  *		... rest of structure
  *	};
  *
@@ -164,19 +164,21 @@ char *(table[]);		/* Pointer to an array of string pointers
  */
 
 int
-LookupStruct(str, table, size)
+LookupStruct(str, table_start, size)
-    char str[];		/* Pointer to a string to be looked up */
+    const char *str;	/* Pointer to a string to be looked up */
-    char **table;	/* Pointer to an array of structs containing string
+    const LookupTable *table_start;
+			/* Pointer to an array of structs containing string
 			 * pointers to valid commands.
 			 * The last table entry should have a NULL
 			 * string pointer.
 			 */
     int	size;		/* The size, in bytes, of each table entry */
 {
+    const char * const *table = (const char * const *)table_start;
     int match = -2;	/* result, initialized to -2 = no match */
-    char **entry;
+    const char * const *entry;
     int pos;
-    char *tabc , *strc ;
+    const char *tabc , *strc ;
 
     /* search for match */
     for (entry = table, pos = 0; *entry != NULL; )
@@ -217,7 +219,7 @@ LookupStruct(str, table, size)
 	    }
 	}
 	pos++;
-	entry = (char **)((long)entry + (long) size);
+	entry = (const char **)((long)entry + (long) size);
     }
     return(match);
 }

utils/lookupany.c

@@ -47,9 +47,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
 int
 LookupAny(c, table)
     char c;
-    char **table;
+    const char * const *table;
 {
-    char **tp;
+    const char * const *tp;
 
     for (tp = table; *tp; tp++)
 	if (strchr(*tp, c) != (char *) 0)

utils/lookupfull.c

@@ -50,10 +50,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
 
 int
 LookupFull(name, table)
-    char *name;
+    const char *name;
-    char **table;
+    const char * const *table;
 {
-    char **tp;
+    const char * const *tp;
 
     for (tp = table; *tp; tp++)
     {
@@ -61,7 +61,7 @@ LookupFull(name, table)
 	    return (tp - table);
 	else
 	{
-	    char *sptr, *tptr;
+	    const char *sptr, *tptr;
 	    for (sptr = name, tptr = *tp; ((*sptr != '\0') && (*tptr != '\0'));
 			sptr++, tptr++)
 		if (toupper(*sptr) != toupper(*tptr))
@@ -84,7 +84,7 @@ LookupFull(name, table)
  *
  *	struct
  *	{
- *		char *string;
+ *		const char *string;
  *		... rest of structure
  *	};
  *
@@ -107,22 +107,23 @@ LookupFull(name, table)
 
 int
 LookupStructFull(str, table, size)
-    char str[];		/* Pointer to a string to be looked up */
+    const char *str;		/* Pointer to a string to be looked up */
-    char **table;	/* Pointer to an array of structs containing string
+    const char * const *table;
+			/* Pointer to an array of structs containing string
 			 * pointers to valid commands.
 			 * The last table entry should have a NULL
 			 * string pointer.
 			 */
     int	size;		/* The size, in bytes, of each table entry */
 {
-  char **entry;
+  const char * const *entry;
   int pos;
 
   for(entry=table, pos=0; *entry!=NULL; pos++) {
     if( strcmp(str, *entry) == 0 ) {
       return pos;
     }
-    entry = (char **)((long)entry + (long)size);
+    entry = (const char * const *)((long)entry + (long)size);
   }
 
   return -1;

utils/utils.h

@@ -34,18 +34,18 @@
  */
 typedef struct
 {
-    char *d_str;
+    const char *d_str;
 } LookupTable;
 
 /* The following stuff just defines the global routines provided
  * by files other than hash and stack and geometry.
  */
 
-extern int Lookup();
+extern int Lookup(const char *str, const char * const *table);
-extern int LookupAny(char, char **);
+extern int LookupAny(char, const char * const *);
-extern int LookupFull(char *, char **);
+extern int LookupFull(const char *, const char * const *);
-extern int LookupStruct();
+extern int LookupStruct(const char *str, const LookupTable *table_start, int size);
-extern int LookupStructFull();
+extern int LookupStructFull(const char *str, const char * const *table, int size);
 extern int PaExpand(char **, char **, int);
 extern char *nextName();
 extern FILE *PaOpen(char *, char *, char *, char *, char *, char **);