diff options
| author | Ken Raeburn | 2002-07-16 19:48:47 +0000 |
|---|---|---|
| committer | Ken Raeburn | 2002-07-16 19:48:47 +0000 |
| commit | 4b2dd2749b41ff287fe4dcd9bf0a6484e0b33027 (patch) | |
| tree | e646caa7062cc6b1ccbf977b1c83afe52e03510c | |
| parent | f29b79a2425b69563c070cd7f4691c504936de10 (diff) | |
| download | emacs-4b2dd2749b41ff287fe4dcd9bf0a6484e0b33027.tar.gz emacs-4b2dd2749b41ff287fe4dcd9bf0a6484e0b33027.zip | |
(intern, oblookup, hash_string): String pointer args
now point to const.
(complete_filename_p, openp): Use const for pointer to
lisp string data.
| -rw-r--r-- | src/lread.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lread.c b/src/lread.c index 38652d096be..28a59941fab 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -958,7 +958,7 @@ static int | |||
| 958 | complete_filename_p (pathname) | 958 | complete_filename_p (pathname) |
| 959 | Lisp_Object pathname; | 959 | Lisp_Object pathname; |
| 960 | { | 960 | { |
| 961 | register unsigned char *s = SDATA (pathname); | 961 | register const unsigned char *s = SDATA (pathname); |
| 962 | return (IS_DIRECTORY_SEP (s[0]) | 962 | return (IS_DIRECTORY_SEP (s[0]) |
| 963 | || (SCHARS (pathname) > 2 | 963 | || (SCHARS (pathname) > 2 |
| 964 | && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2])) | 964 | && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2])) |
| @@ -1122,7 +1122,7 @@ openp (path, str, suffixes, storeptr, predicate) | |||
| 1122 | } | 1122 | } |
| 1123 | else | 1123 | else |
| 1124 | { | 1124 | { |
| 1125 | char *pfn; | 1125 | const char *pfn; |
| 1126 | 1126 | ||
| 1127 | encoded_fn = ENCODE_FILE (string); | 1127 | encoded_fn = ENCODE_FILE (string); |
| 1128 | pfn = SDATA (encoded_fn); | 1128 | pfn = SDATA (encoded_fn); |
| @@ -2973,7 +2973,6 @@ Lisp_Object initial_obarray; | |||
| 2973 | int oblookup_last_bucket_number; | 2973 | int oblookup_last_bucket_number; |
| 2974 | 2974 | ||
| 2975 | static int hash_string (); | 2975 | static int hash_string (); |
| 2976 | Lisp_Object oblookup (); | ||
| 2977 | 2976 | ||
| 2978 | /* Get an error if OBARRAY is not an obarray. | 2977 | /* Get an error if OBARRAY is not an obarray. |
| 2979 | If it is one, return it. */ | 2978 | If it is one, return it. */ |
| @@ -2997,7 +2996,7 @@ check_obarray (obarray) | |||
| 2997 | 2996 | ||
| 2998 | Lisp_Object | 2997 | Lisp_Object |
| 2999 | intern (str) | 2998 | intern (str) |
| 3000 | char *str; | 2999 | const char *str; |
| 3001 | { | 3000 | { |
| 3002 | Lisp_Object tem; | 3001 | Lisp_Object tem; |
| 3003 | int len = strlen (str); | 3002 | int len = strlen (str); |
| @@ -3174,7 +3173,7 @@ OBARRAY defaults to the value of the variable `obarray'. */) | |||
| 3174 | Lisp_Object | 3173 | Lisp_Object |
| 3175 | oblookup (obarray, ptr, size, size_byte) | 3174 | oblookup (obarray, ptr, size, size_byte) |
| 3176 | Lisp_Object obarray; | 3175 | Lisp_Object obarray; |
| 3177 | register char *ptr; | 3176 | register const char *ptr; |
| 3178 | int size, size_byte; | 3177 | int size, size_byte; |
| 3179 | { | 3178 | { |
| 3180 | int hash; | 3179 | int hash; |
| @@ -3215,11 +3214,11 @@ oblookup (obarray, ptr, size, size_byte) | |||
| 3215 | 3214 | ||
| 3216 | static int | 3215 | static int |
| 3217 | hash_string (ptr, len) | 3216 | hash_string (ptr, len) |
| 3218 | unsigned char *ptr; | 3217 | const unsigned char *ptr; |
| 3219 | int len; | 3218 | int len; |
| 3220 | { | 3219 | { |
| 3221 | register unsigned char *p = ptr; | 3220 | register const unsigned char *p = ptr; |
| 3222 | register unsigned char *end = p + len; | 3221 | register const unsigned char *end = p + len; |
| 3223 | register unsigned char c; | 3222 | register unsigned char c; |
| 3224 | register int hash = 0; | 3223 | register int hash = 0; |
| 3225 | 3224 | ||