diff options
| author | Andreas Schwab | 2010-07-11 11:27:13 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-07-11 11:27:13 +0200 |
| commit | a8fe7202b4d4b86cdc66997dc624a367631abd51 (patch) | |
| tree | b53c886cc1a66869d5b01d79384d8241a0a5cefa /src/lread.c | |
| parent | bb8e180f2ce13346ee082b35d557d244e73f281c (diff) | |
| download | emacs-a8fe7202b4d4b86cdc66997dc624a367631abd51.tar.gz emacs-a8fe7202b4d4b86cdc66997dc624a367631abd51.zip | |
Constify functions taking char *
* alloc.c (pending_malloc_warning, malloc_warning): Add const.
* callproc.c (relocate_fd, getenv_internal_1, getenv_internal)
(egetenv): Likewise.
* doprnt.c (doprnt): Likewise.
* editfns.c (set_time_zone_rule, format2): Likewise.
* emacs.c (decode_env_path): Likewise.
* eval.c (signal_error, error): Likewise.
* insdel.c (replace_range_2): Likewise.
* keyboard.c (cmd_error_internal): Likewise.
* lread.c (isfloat_string, make_symbol, dir_warning): Likewise.
* print.c (write_string, write_string_1, print_error_message):
Likewise.
* vm-limit.c (warn_function, memory_warnings): Likewise.
* xdisp.c (message1, message1_nolog, message_with_string)
(vmessage, message, message_nolog): Likewise.
* emacs.c: Remove duplicate declaration.
* keyboard.h: Likewise.
* lisp.h: Update prototypes.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lread.c b/src/lread.c index c8c464875bf..b9e47e3fccf 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -3190,11 +3190,10 @@ substitute_in_interval (INTERVAL interval, Lisp_Object arg) | |||
| 3190 | #define EXP_INT 16 | 3190 | #define EXP_INT 16 |
| 3191 | 3191 | ||
| 3192 | int | 3192 | int |
| 3193 | isfloat_string (register char *cp, int ignore_trailing) | 3193 | isfloat_string (const char *cp, int ignore_trailing) |
| 3194 | { | 3194 | { |
| 3195 | register int state; | 3195 | int state; |
| 3196 | 3196 | const char *start = cp; | |
| 3197 | char *start = cp; | ||
| 3198 | 3197 | ||
| 3199 | state = 0; | 3198 | state = 0; |
| 3200 | if (*cp == '+' || *cp == '-') | 3199 | if (*cp == '+' || *cp == '-') |
| @@ -3245,7 +3244,8 @@ isfloat_string (register char *cp, int ignore_trailing) | |||
| 3245 | } | 3244 | } |
| 3246 | 3245 | ||
| 3247 | return ((ignore_trailing | 3246 | return ((ignore_trailing |
| 3248 | || (*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f')) | 3247 | || *cp == 0 || *cp == ' ' || *cp == '\t' || *cp == '\n' |
| 3248 | || *cp == '\r' || *cp == '\f') | ||
| 3249 | && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) | 3249 | && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) |
| 3250 | || state == (DOT_CHAR|TRAIL_INT) | 3250 | || state == (DOT_CHAR|TRAIL_INT) |
| 3251 | || state == (LEAD_INT|E_CHAR|EXP_INT) | 3251 | || state == (LEAD_INT|E_CHAR|EXP_INT) |
| @@ -3588,13 +3588,13 @@ intern_c_string (const char *str) | |||
| 3588 | /* Create an uninterned symbol with name STR. */ | 3588 | /* Create an uninterned symbol with name STR. */ |
| 3589 | 3589 | ||
| 3590 | Lisp_Object | 3590 | Lisp_Object |
| 3591 | make_symbol (char *str) | 3591 | make_symbol (const char *str) |
| 3592 | { | 3592 | { |
| 3593 | int len = strlen (str); | 3593 | int len = strlen (str); |
| 3594 | 3594 | ||
| 3595 | return Fmake_symbol ((!NILP (Vpurify_flag) | 3595 | return Fmake_symbol (!NILP (Vpurify_flag) |
| 3596 | ? make_pure_string (str, len, len, 0) | 3596 | ? make_pure_string (str, len, len, 0) |
| 3597 | : make_string (str, len))); | 3597 | : make_string (str, len)); |
| 3598 | } | 3598 | } |
| 3599 | 3599 | ||
| 3600 | DEFUN ("intern", Fintern, Sintern, 1, 2, 0, | 3600 | DEFUN ("intern", Fintern, Sintern, 1, 2, 0, |
| @@ -4170,7 +4170,7 @@ init_lread (void) | |||
| 4170 | does not exist. Print it on stderr and put it in *Messages*. */ | 4170 | does not exist. Print it on stderr and put it in *Messages*. */ |
| 4171 | 4171 | ||
| 4172 | void | 4172 | void |
| 4173 | dir_warning (char *format, Lisp_Object dirname) | 4173 | dir_warning (const char *format, Lisp_Object dirname) |
| 4174 | { | 4174 | { |
| 4175 | char *buffer | 4175 | char *buffer |
| 4176 | = (char *) alloca (SCHARS (dirname) + strlen (format) + 5); | 4176 | = (char *) alloca (SCHARS (dirname) + strlen (format) + 5); |