comparison src/dired.c @ 109555:05e7e7c46ff0

Use const, move declarations to header files. * src/buffer.c (Fset_buffer_multibyte): Remove local extern declaration. * src/character.c (strwidth, parse_str_to_multibyte): Add const. * src/character.h (strwidth, parse_str_to_multibyte): Likewise. * src/charset.c (add_to_log): Remove declaration. * src/composite.c (syms_of_composite): Remove local extern declarations. * src/data.c (Finteractive_form): Use const. * src/dired.c (scmp): Add const. (directory_files_internal): Remove local extern declaration. * src/dispextern.h (add_to_log): Remove declaration. (x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg) (x_frame_get_and_record_arg, x_default_parameter): Add const. * src/dispnew.c: Remove duplicate #include <unistd.h>. (update_window, update_frame_1, init_display): Remove local extern declarations. * src/editfns.c (region_limit, syms_of_editfns): Remove local extern declarations. * src/emacs.c (main): Remove local extern declaration. * src/font.c (Qnormal, QCtype, QCfamily, QCweight, QCslant, QCwidth) (QCheight, QCsize, QCname): Remove declarations. * src/frame.c (x_get_resource_string, x_get_string_resource) (x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg) (x_default_parameter): Use const. * src/image.c (QCwidth, QCheight, QCforeground, QCbackground, QCfile) (QCdata, QCtype, Qcenter): Remove declarations. * src/keyboard.h (do_mouse_tracking): Add declaration. * src/minibuf.c (Qmouse_face): Remove declaration. * src/msdos.c (IT_note_mouse_highlight): Remove local extern declaration. * src/xdisp.c (do_mouse_tracking): Remove declaration. (add_to_log): Use const. * src/xfaces.c (Qmouse_face): Remove declaration. (face_color_gray_p, tty_defined_color, defined_color) (face_color_gray_p, face_color_supported_p). Add const. * src/xfns.c: Include xlwmenu.h when USE_LUCID. (x_defined_color, xic_set_xfontset): Use const. (Fx_hide_tip): Remove local extern declaration. * src/xselect.c (selection_data_to_lisp_data) (x_property_data_to_lisp): * src/xrdb.c (x_get_string_resource, file_p) (x_get_customization_string, magic_file_p, search_magic_path) (get_system_app, get_user_app, x_load_resources, x_get_resource) (x_get_string_resource): Use const. * src/xterm.c (xlwmenu_window_p, xlwmenu_redisplay): Remove declarations. (x_text_icon, x_check_errors, x_connection_closed): Use const. * src/xterm.h (x_get_customization_string, x_load_resources) (x_get_resource, x_text_icon, x_text_icon, x_check_errors) (x_check_errors, x_property_data_to_lisp, defined_color) (xic_set_xfontset, x_defined_color): Use const.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 26 Jul 2010 20:52:35 -0700
parents 68ca98ae70fb
children 228a5fa4eda0
comparison
equal deleted inserted replaced
109554:b22b609d1fa7 109555:05e7e7c46ff0
113 Lisp_Object Qfile_name_completion; 113 Lisp_Object Qfile_name_completion;
114 Lisp_Object Qfile_name_all_completions; 114 Lisp_Object Qfile_name_all_completions;
115 Lisp_Object Qfile_attributes; 115 Lisp_Object Qfile_attributes;
116 Lisp_Object Qfile_attributes_lessp; 116 Lisp_Object Qfile_attributes_lessp;
117 117
118 static int scmp (unsigned char *, unsigned char *, int); 118 static int scmp (const unsigned char *, const unsigned char *, int);
119 119
120 #ifdef WINDOWSNT 120 #ifdef WINDOWSNT
121 Lisp_Object 121 Lisp_Object
122 directory_files_internal_w32_unwind (Lisp_Object arg) 122 directory_files_internal_w32_unwind (Lisp_Object arg)
123 { 123 {
204 make_save_value (d, 0)); 204 make_save_value (d, 0));
205 205
206 #ifdef WINDOWSNT 206 #ifdef WINDOWSNT
207 if (attrs) 207 if (attrs)
208 { 208 {
209 extern Lisp_Object Qlocal;
210 extern int is_slow_fs (const char *); 209 extern int is_slow_fs (const char *);
211 210
212 /* Do this only once to avoid doing it (in w32.c:stat) for each 211 /* Do this only once to avoid doing it (in w32.c:stat) for each
213 file in the directory, when we call Ffile_attributes below. */ 212 file in the directory, when we call Ffile_attributes below. */
214 record_unwind_protect (directory_files_internal_w32_unwind, 213 record_unwind_protect (directory_files_internal_w32_unwind,
811 ignoring case if appropriate. 810 ignoring case if appropriate.
812 Return -1 if strings match, 811 Return -1 if strings match,
813 else number of chars that match at the beginning. */ 812 else number of chars that match at the beginning. */
814 813
815 static int 814 static int
816 scmp (register unsigned char *s1, register unsigned char *s2, int len) 815 scmp (const unsigned char *s1, const unsigned char *s2, int len)
817 { 816 {
818 register int l = len; 817 register int l = len;
819 818
820 if (completion_ignore_case) 819 if (completion_ignore_case)
821 { 820 {