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/lisp.h | |
| 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/lisp.h')
| -rw-r--r-- | src/lisp.h | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/src/lisp.h b/src/lisp.h index 16fe4702d5c..d59b75caa2f 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2616,7 +2616,7 @@ extern void adjust_markers_for_delete (EMACS_INT, EMACS_INT, | |||
| 2616 | EMACS_INT, EMACS_INT); | 2616 | EMACS_INT, EMACS_INT); |
| 2617 | extern void replace_range (EMACS_INT, EMACS_INT, Lisp_Object, int, int, int); | 2617 | extern void replace_range (EMACS_INT, EMACS_INT, Lisp_Object, int, int, int); |
| 2618 | extern void replace_range_2 (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, | 2618 | extern void replace_range_2 (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, |
| 2619 | char *, EMACS_INT, EMACS_INT, int); | 2619 | const char *, EMACS_INT, EMACS_INT, int); |
| 2620 | extern void syms_of_insdel (void); | 2620 | extern void syms_of_insdel (void); |
| 2621 | 2621 | ||
| 2622 | /* Defined in dispnew.c */ | 2622 | /* Defined in dispnew.c */ |
| @@ -2650,16 +2650,16 @@ extern void restore_message (void); | |||
| 2650 | extern Lisp_Object current_message (void); | 2650 | extern Lisp_Object current_message (void); |
| 2651 | extern void set_message (const char *s, Lisp_Object, int, int); | 2651 | extern void set_message (const char *s, Lisp_Object, int, int); |
| 2652 | extern void clear_message (int, int); | 2652 | extern void clear_message (int, int); |
| 2653 | extern void message (char *, ...); | 2653 | extern void message (const char *, ...); |
| 2654 | extern void message_nolog (char *, ...); | 2654 | extern void message_nolog (const char *, ...); |
| 2655 | extern void message1 (char *); | 2655 | extern void message1 (const char *); |
| 2656 | extern void message1_nolog (char *); | 2656 | extern void message1_nolog (const char *); |
| 2657 | extern void message2 (const char *, int, int); | 2657 | extern void message2 (const char *, int, int); |
| 2658 | extern void message2_nolog (const char *, int, int); | 2658 | extern void message2_nolog (const char *, int, int); |
| 2659 | extern void message3 (Lisp_Object, int, int); | 2659 | extern void message3 (Lisp_Object, int, int); |
| 2660 | extern void message3_nolog (Lisp_Object, int, int); | 2660 | extern void message3_nolog (Lisp_Object, int, int); |
| 2661 | extern void message_dolog (const char *, int, int, int); | 2661 | extern void message_dolog (const char *, int, int, int); |
| 2662 | extern void message_with_string (char *, Lisp_Object, int); | 2662 | extern void message_with_string (const char *, Lisp_Object, int); |
| 2663 | extern void message_log_maybe_newline (void); | 2663 | extern void message_log_maybe_newline (void); |
| 2664 | extern void update_echo_area (void); | 2664 | extern void update_echo_area (void); |
| 2665 | extern void truncate_echo_area (int); | 2665 | extern void truncate_echo_area (int); |
| @@ -2680,14 +2680,14 @@ extern int pos_visible_p (struct window *, int, int *, | |||
| 2680 | extern void syms_of_xsettings (void); | 2680 | extern void syms_of_xsettings (void); |
| 2681 | 2681 | ||
| 2682 | /* Defined in vm-limit.c. */ | 2682 | /* Defined in vm-limit.c. */ |
| 2683 | extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (char*)); | 2683 | extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (const char *)); |
| 2684 | 2684 | ||
| 2685 | /* Defined in alloc.c */ | 2685 | /* Defined in alloc.c */ |
| 2686 | extern void check_pure_size (void); | 2686 | extern void check_pure_size (void); |
| 2687 | extern void allocate_string_data (struct Lisp_String *, int, int); | 2687 | extern void allocate_string_data (struct Lisp_String *, int, int); |
| 2688 | extern void reset_malloc_hooks (void); | 2688 | extern void reset_malloc_hooks (void); |
| 2689 | extern void uninterrupt_malloc (void); | 2689 | extern void uninterrupt_malloc (void); |
| 2690 | extern void malloc_warning (char *); | 2690 | extern void malloc_warning (const char *); |
| 2691 | extern void memory_full (void) NO_RETURN; | 2691 | extern void memory_full (void) NO_RETURN; |
| 2692 | extern void buffer_memory_full (void) NO_RETURN; | 2692 | extern void buffer_memory_full (void) NO_RETURN; |
| 2693 | extern int survives_gc_p (Lisp_Object); | 2693 | extern int survives_gc_p (Lisp_Object); |
| @@ -2791,16 +2791,17 @@ extern Lisp_Object Qexternal_debugging_output; | |||
| 2791 | extern void temp_output_buffer_setup (const char *); | 2791 | extern void temp_output_buffer_setup (const char *); |
| 2792 | extern int print_level, print_escape_newlines; | 2792 | extern int print_level, print_escape_newlines; |
| 2793 | extern Lisp_Object Qprint_escape_newlines; | 2793 | extern Lisp_Object Qprint_escape_newlines; |
| 2794 | extern void write_string (char *, int); | 2794 | extern void write_string (const char *, int); |
| 2795 | extern void write_string_1 (char *, int, Lisp_Object); | 2795 | extern void write_string_1 (const char *, int, Lisp_Object); |
| 2796 | extern void print_error_message (Lisp_Object, Lisp_Object, char *, Lisp_Object); | 2796 | extern void print_error_message (Lisp_Object, Lisp_Object, const char *, |
| 2797 | Lisp_Object); | ||
| 2797 | extern Lisp_Object internal_with_output_to_temp_buffer | 2798 | extern Lisp_Object internal_with_output_to_temp_buffer |
| 2798 | (const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object); | 2799 | (const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object); |
| 2799 | extern void float_to_string (unsigned char *, double); | 2800 | extern void float_to_string (unsigned char *, double); |
| 2800 | extern void syms_of_print (void); | 2801 | extern void syms_of_print (void); |
| 2801 | 2802 | ||
| 2802 | /* Defined in doprnt.c */ | 2803 | /* Defined in doprnt.c */ |
| 2803 | extern int doprnt (char *, int, char *, char *, va_list); | 2804 | extern int doprnt (char *, int, const char *, const char *, va_list); |
| 2804 | 2805 | ||
| 2805 | /* Defined in lread.c */ | 2806 | /* Defined in lread.c */ |
| 2806 | extern Lisp_Object Qvariable_documentation, Qstandard_input; | 2807 | extern Lisp_Object Qvariable_documentation, Qstandard_input; |
| @@ -2819,7 +2820,7 @@ EXFUN (Feval_region, 4); | |||
| 2819 | extern Lisp_Object check_obarray (Lisp_Object); | 2820 | extern Lisp_Object check_obarray (Lisp_Object); |
| 2820 | extern Lisp_Object intern (const char *); | 2821 | extern Lisp_Object intern (const char *); |
| 2821 | extern Lisp_Object intern_c_string (const char *); | 2822 | extern Lisp_Object intern_c_string (const char *); |
| 2822 | extern Lisp_Object make_symbol (char *); | 2823 | extern Lisp_Object make_symbol (const char *); |
| 2823 | extern Lisp_Object oblookup (Lisp_Object, const char *, int, int); | 2824 | extern Lisp_Object oblookup (Lisp_Object, const char *, int, int); |
| 2824 | #define LOADHIST_ATTACH(x) \ | 2825 | #define LOADHIST_ATTACH(x) \ |
| 2825 | do { \ | 2826 | do { \ |
| @@ -2829,10 +2830,10 @@ extern Lisp_Object Vcurrent_load_list; | |||
| 2829 | extern Lisp_Object Vload_history, Vload_suffixes, Vload_file_rep_suffixes; | 2830 | extern Lisp_Object Vload_history, Vload_suffixes, Vload_file_rep_suffixes; |
| 2830 | extern int openp (Lisp_Object, Lisp_Object, Lisp_Object, | 2831 | extern int openp (Lisp_Object, Lisp_Object, Lisp_Object, |
| 2831 | Lisp_Object *, Lisp_Object); | 2832 | Lisp_Object *, Lisp_Object); |
| 2832 | extern int isfloat_string (char *, int); | 2833 | extern int isfloat_string (const char *, int); |
| 2833 | extern void map_obarray (Lisp_Object, void (*) (Lisp_Object, Lisp_Object), | 2834 | extern void map_obarray (Lisp_Object, void (*) (Lisp_Object, Lisp_Object), |
| 2834 | Lisp_Object); | 2835 | Lisp_Object); |
| 2835 | extern void dir_warning (char *, Lisp_Object); | 2836 | extern void dir_warning (const char *, Lisp_Object); |
| 2836 | extern void close_load_descs (void); | 2837 | extern void close_load_descs (void); |
| 2837 | extern void init_obarray (void); | 2838 | extern void init_obarray (void); |
| 2838 | extern void init_lread (void); | 2839 | extern void init_lread (void); |
| @@ -2885,7 +2886,7 @@ extern void xsignal0 (Lisp_Object) NO_RETURN; | |||
| 2885 | extern void xsignal1 (Lisp_Object, Lisp_Object) NO_RETURN; | 2886 | extern void xsignal1 (Lisp_Object, Lisp_Object) NO_RETURN; |
| 2886 | extern void xsignal2 (Lisp_Object, Lisp_Object, Lisp_Object) NO_RETURN; | 2887 | extern void xsignal2 (Lisp_Object, Lisp_Object, Lisp_Object) NO_RETURN; |
| 2887 | extern void xsignal3 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object) NO_RETURN; | 2888 | extern void xsignal3 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object) NO_RETURN; |
| 2888 | extern void signal_error (char *, Lisp_Object) NO_RETURN; | 2889 | extern void signal_error (const char *, Lisp_Object) NO_RETURN; |
| 2889 | EXFUN (Fautoload, 5); | 2890 | EXFUN (Fautoload, 5); |
| 2890 | EXFUN (Fcommandp, 2); | 2891 | EXFUN (Fcommandp, 2); |
| 2891 | EXFUN (Feval, 1); | 2892 | EXFUN (Feval, 1); |
| @@ -2912,7 +2913,7 @@ extern Lisp_Object internal_condition_case_n (Lisp_Object (*) (int, Lisp_Object | |||
| 2912 | extern void specbind (Lisp_Object, Lisp_Object); | 2913 | extern void specbind (Lisp_Object, Lisp_Object); |
| 2913 | extern void record_unwind_protect (Lisp_Object (*) (Lisp_Object), Lisp_Object); | 2914 | extern void record_unwind_protect (Lisp_Object (*) (Lisp_Object), Lisp_Object); |
| 2914 | extern Lisp_Object unbind_to (int, Lisp_Object); | 2915 | extern Lisp_Object unbind_to (int, Lisp_Object); |
| 2915 | extern void error (char *, ...) NO_RETURN; | 2916 | extern void error (const char *, ...) NO_RETURN; |
| 2916 | extern void do_autoload (Lisp_Object, Lisp_Object); | 2917 | extern void do_autoload (Lisp_Object, Lisp_Object); |
| 2917 | extern Lisp_Object un_autoload (Lisp_Object); | 2918 | extern Lisp_Object un_autoload (Lisp_Object); |
| 2918 | EXFUN (Ffetch_bytecode, 1); | 2919 | EXFUN (Ffetch_bytecode, 1); |
| @@ -2951,7 +2952,7 @@ EXFUN (Fbolp, 0); | |||
| 2951 | EXFUN (Fbobp, 0); | 2952 | EXFUN (Fbobp, 0); |
| 2952 | EXFUN (Fformat, MANY); | 2953 | EXFUN (Fformat, MANY); |
| 2953 | EXFUN (Fmessage, MANY); | 2954 | EXFUN (Fmessage, MANY); |
| 2954 | extern Lisp_Object format2 (char *, Lisp_Object, Lisp_Object); | 2955 | extern Lisp_Object format2 (const char *, Lisp_Object, Lisp_Object); |
| 2955 | EXFUN (Fbuffer_substring, 2); | 2956 | EXFUN (Fbuffer_substring, 2); |
| 2956 | EXFUN (Fbuffer_string, 0); | 2957 | EXFUN (Fbuffer_string, 0); |
| 2957 | extern Lisp_Object save_excursion_save (void); | 2958 | extern Lisp_Object save_excursion_save (void); |
| @@ -2977,7 +2978,7 @@ EXFUN (Fdelete_field, 1); | |||
| 2977 | EXFUN (Ffield_beginning, 3); | 2978 | EXFUN (Ffield_beginning, 3); |
| 2978 | EXFUN (Ffield_end, 3); | 2979 | EXFUN (Ffield_end, 3); |
| 2979 | EXFUN (Ffield_string_no_properties, 1); | 2980 | EXFUN (Ffield_string_no_properties, 1); |
| 2980 | extern void set_time_zone_rule (char *); | 2981 | extern void set_time_zone_rule (const char *); |
| 2981 | 2982 | ||
| 2982 | /* Defined in buffer.c */ | 2983 | /* Defined in buffer.c */ |
| 2983 | extern int mouse_face_overlay_overlaps (Lisp_Object); | 2984 | extern int mouse_face_overlay_overlaps (Lisp_Object); |
| @@ -3177,7 +3178,7 @@ extern int detect_input_pending (void); | |||
| 3177 | extern int detect_input_pending_ignore_squeezables (void); | 3178 | extern int detect_input_pending_ignore_squeezables (void); |
| 3178 | extern int detect_input_pending_run_timers (int); | 3179 | extern int detect_input_pending_run_timers (int); |
| 3179 | extern void safe_run_hooks (Lisp_Object); | 3180 | extern void safe_run_hooks (Lisp_Object); |
| 3180 | extern void cmd_error_internal (Lisp_Object, char *); | 3181 | extern void cmd_error_internal (Lisp_Object, const char *); |
| 3181 | extern Lisp_Object command_loop_1 (void); | 3182 | extern Lisp_Object command_loop_1 (void); |
| 3182 | extern Lisp_Object recursive_edit_1 (void); | 3183 | extern Lisp_Object recursive_edit_1 (void); |
| 3183 | extern void record_auto_save (void); | 3184 | extern void record_auto_save (void); |
| @@ -3241,7 +3242,7 @@ extern void frames_bury_buffer (Lisp_Object); | |||
| 3241 | extern void syms_of_frame (void); | 3242 | extern void syms_of_frame (void); |
| 3242 | 3243 | ||
| 3243 | /* Defined in emacs.c */ | 3244 | /* Defined in emacs.c */ |
| 3244 | extern Lisp_Object decode_env_path (char *, char *); | 3245 | extern Lisp_Object decode_env_path (const char *, const char *); |
| 3245 | extern Lisp_Object Vinvocation_name, Vinvocation_directory; | 3246 | extern Lisp_Object Vinvocation_name, Vinvocation_directory; |
| 3246 | extern Lisp_Object Vbefore_init_time, Vafter_init_time; | 3247 | extern Lisp_Object Vbefore_init_time, Vafter_init_time; |
| 3247 | extern Lisp_Object Vinstallation_directory; | 3248 | extern Lisp_Object Vinstallation_directory; |
| @@ -3527,7 +3528,7 @@ extern void xfree (POINTER_TYPE *); | |||
| 3527 | 3528 | ||
| 3528 | extern char *xstrdup (const char *); | 3529 | extern char *xstrdup (const char *); |
| 3529 | 3530 | ||
| 3530 | extern char *egetenv (char *); | 3531 | extern char *egetenv (const char *); |
| 3531 | 3532 | ||
| 3532 | /* Set up the name of the machine we're running on. */ | 3533 | /* Set up the name of the machine we're running on. */ |
| 3533 | extern void init_system_name (void); | 3534 | extern void init_system_name (void); |