From 4a722565abe46ce8ea3c694c4012c996eaae8c52 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 26 Jan 2021 12:04:36 +0700 Subject: [PATCH] Sprinkle some `const` on `char *` params. (#298) This is enough to let us move `il_string` in `loopsops.c` into read-only storage. --- inc/gcarraydefs.h | 4 ++-- inc/testtooldefs.h | 2 +- src/gcarray.c | 4 ++-- src/loopsops.c | 2 +- src/testtool.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/gcarraydefs.h b/inc/gcarraydefs.h index 46f616e..c3aa98e 100644 --- a/inc/gcarraydefs.h +++ b/inc/gcarraydefs.h @@ -1,7 +1,7 @@ #ifndef GCARRAYDEFS_H #define GCARRAYDEFS_H 1 LispPTR aref1(LispPTR array, int index); -LispPTR find_symbol(char *char_base, DLword offset, DLword length, LispPTR hashtbl, DLword fatp, DLword lispp); -LispPTR get_package_atom(char *char_base, DLword charlen, char *packname, DLword packlen, int externalp); +LispPTR find_symbol(const char *char_base, DLword offset, DLword length, LispPTR hashtbl, DLword fatp, DLword lispp); +LispPTR get_package_atom(const char *char_base, DLword charlen, const char *packname, DLword packlen, int externalp); LispPTR with_symbol(LispPTR char_base, LispPTR offset, LispPTR charlen, LispPTR fatp, LispPTR hashtbl, LispPTR result); #endif diff --git a/inc/testtooldefs.h b/inc/testtooldefs.h index 622113d..492b198 100644 --- a/inc/testtooldefs.h +++ b/inc/testtooldefs.h @@ -4,7 +4,7 @@ #include "cell.h" void print_package_name(int index); void print_atomname(LispPTR index); -int find_package_from_name(char *packname, int len); +int find_package_from_name(const char *packname, int len); void print_package_name(int index); void dump_dtd(void); void check_type_68k(int type, LispPTR *ptr); diff --git a/src/gcarray.c b/src/gcarray.c index 376e574..da57fe3 100644 --- a/src/gcarray.c +++ b/src/gcarray.c @@ -146,7 +146,7 @@ LispPTR aref1(LispPTR array, int index) { /* */ /************************************************************************/ -LispPTR find_symbol(char *char_base, DLword offset, DLword length, LispPTR hashtbl, DLword fatp, +LispPTR find_symbol(const char *char_base, DLword offset, DLword length, LispPTR hashtbl, DLword fatp, DLword lispp) /* T => the "chars" coming in are 16-bit */ @@ -253,7 +253,7 @@ retry: /* */ /************************************************************************/ -LispPTR get_package_atom(char *char_base, DLword charlen, char *packname, DLword packlen, +LispPTR get_package_atom(const char *char_base, DLword charlen, const char *packname, DLword packlen, int externalp) { int packindex; PACKAGE *packaddr; diff --git a/src/loopsops.c b/src/loopsops.c index 4f5bf94..0cdfa01 100644 --- a/src/loopsops.c +++ b/src/loopsops.c @@ -34,7 +34,7 @@ #include "gcarraydefs.h" #include "gchtfinddefs.h" -static char il_string[] = "INTERLISP"; +static const char il_string[] = "INTERLISP"; #define GET_IL_ATOM(string) get_package_atom((string), (sizeof(string) - 1), il_string, 9, NIL) #define AtomValPtr(index) Addr68k_from_LADDR(*(GetVALCELL68k(index))) diff --git a/src/testtool.c b/src/testtool.c index eda98cf..a218bcc 100644 --- a/src/testtool.c +++ b/src/testtool.c @@ -107,7 +107,7 @@ void print_atomname(LispPTR index) #define PACKAGES_LIMIT 255 /** GET PACKAGE INDEX from PACKAGE FULL NAME */ -int find_package_from_name(char *packname, int len) { +int find_package_from_name(const char *packname, int len) { int index; PACKAGE *package; NEWSTRINGP *namestring;