Mercurial > emacs
comparison src/lread.c @ 46472:c246e05b9c70
(intern, oblookup, hash_string): String pointer args
now point to const.
(complete_filename_p, openp): Use const for pointer to
lisp string data.
author | Ken Raeburn <raeburn@raeburn.org> |
---|---|
date | Tue, 16 Jul 2002 19:48:47 +0000 |
parents | 34f82dbd015b |
children | 3bd4234e0844 |
comparison
equal
deleted
inserted
replaced
46471:028a5b2de9e4 | 46472:c246e05b9c70 |
---|---|
956 | 956 |
957 static int | 957 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])) |
965 #ifdef ALTOS | 965 #ifdef ALTOS |
966 || *s == '@' | 966 || *s == '@' |
1120 return -2; | 1120 return -2; |
1121 } | 1121 } |
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); |
1129 exists = (stat (pfn, &st) >= 0 | 1129 exists = (stat (pfn, &st) >= 0 |
1130 && (st.st_mode & S_IFMT) != S_IFDIR); | 1130 && (st.st_mode & S_IFMT) != S_IFDIR); |
2971 /* oblookup stores the bucket number here, for the sake of Funintern. */ | 2971 /* oblookup stores the bucket number here, for the sake of Funintern. */ |
2972 | 2972 |
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. */ |
2980 | 2979 |
2981 Lisp_Object | 2980 Lisp_Object |
2995 /* Intern the C string STR: return a symbol with that name, | 2994 /* Intern the C string STR: return a symbol with that name, |
2996 interned in the current obarray. */ | 2995 interned in the current 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); |
3004 Lisp_Object obarray; | 3003 Lisp_Object obarray; |
3005 | 3004 |
3172 Also store the bucket number in oblookup_last_bucket_number. */ | 3171 Also store the bucket number in oblookup_last_bucket_number. */ |
3173 | 3172 |
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; |
3181 int obsize; | 3180 int obsize; |
3182 register Lisp_Object tail; | 3181 register Lisp_Object tail; |
3213 return tem; | 3212 return tem; |
3214 } | 3213 } |
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 |
3226 while (p != end) | 3225 while (p != end) |
3227 { | 3226 { |