From: Paul Eggert Date: Sat, 19 Mar 2022 19:35:04 +0000 (-0700) Subject: Remove unused fns/data and make fns static X-Git-Tag: emacs-29.0.90~1931^2~1038^2~4 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0fed5610426e141b057fc359ab9a86b3ac7e9df5;p=emacs.git Remove unused fns/data and make fns static * src/comp.c (saved_sigset, helper_temp_output_buffer_setup): Remove; unused. * src/comp.c (logfile, helper_link_table): * src/fns.c (hashfn_equal, hashfn_eql): * src/frame.c (frame_windows_min_size): * src/gnutls.c (emacs_gnutls_global_init): * src/minibuf.c (Vcommand_loop_level_list): * src/syntax.c (syntax_code_spec): * src/timefns.c (time_overflow): * src/xterm.c (x_xrender_color_from_gc_foreground) (x_display_set_last_user_time): Now static, since it’s not used elsewhere. * src/xterm.c (x_xrender_color_from_gc_foreground) (x_xrender_color_from_gc_background): Move earlier to avoid forward use. (x_xrender_color_from_gc_foreground): Do not define unless !defined USE_CAIRO && (RENDER_MAJOR > 0 || RENDER_MINOR >= 2), since it’s not used otherwise. --- diff --git a/src/comp.c b/src/comp.c index ef9dcf15274..d0173491a2e 100644 --- a/src/comp.c +++ b/src/comp.c @@ -516,8 +516,6 @@ typedef struct { ptrdiff_t size; } f_reloc_t; -sigset_t saved_sigset; - static f_reloc_t freloc; #define NUM_CAST_TYPES 15 @@ -648,7 +646,7 @@ typedef struct { static comp_t comp; -FILE *logfile = NULL; +static FILE *logfile; /* This is used for serialized objects by the reload mechanism. */ typedef struct { @@ -667,7 +665,6 @@ typedef struct { */ void helper_unwind_protect (Lisp_Object handler); -Lisp_Object helper_temp_output_buffer_setup (Lisp_Object x); Lisp_Object helper_unbind_n (Lisp_Object n); void helper_save_restriction (void); bool helper_PSEUDOVECTOR_TYPEP_XUNTAG (Lisp_Object a, enum pvec_type code); @@ -675,7 +672,7 @@ struct Lisp_Symbol_With_Pos *helper_GET_SYMBOL_WITH_POSITION (Lisp_Object a); /* Note: helper_link_table must match the list created by `declare_runtime_imported_funcs'. */ -void *helper_link_table[] = +static void *helper_link_table[] = { wrong_type_argument, helper_PSEUDOVECTOR_TYPEP_XUNTAG, pure_write_error, @@ -4984,14 +4981,6 @@ helper_unwind_protect (Lisp_Object handler) handler); } -Lisp_Object -helper_temp_output_buffer_setup (Lisp_Object x) -{ - CHECK_STRING (x); - temp_output_buffer_setup (SSDATA (x)); - return Vstandard_output; -} - Lisp_Object helper_unbind_n (Lisp_Object n) { diff --git a/src/fns.c b/src/fns.c index 4caf8448f1f..0cc0c0a53d8 100644 --- a/src/fns.c +++ b/src/fns.c @@ -4214,7 +4214,7 @@ hashfn_eq (Lisp_Object key, struct Lisp_Hash_Table *h) /* Ignore HT and return a hash code for KEY which uses 'equal' to compare keys. The hash code is at most INTMASK. */ -Lisp_Object +static Lisp_Object hashfn_equal (Lisp_Object key, struct Lisp_Hash_Table *h) { return make_ufixnum (sxhash (key)); @@ -4223,7 +4223,7 @@ hashfn_equal (Lisp_Object key, struct Lisp_Hash_Table *h) /* Ignore HT and return a hash code for KEY which uses 'eql' to compare keys. The hash code is at most INTMASK. */ -Lisp_Object +static Lisp_Object hashfn_eql (Lisp_Object key, struct Lisp_Hash_Table *h) { return (FLOATP (key) || BIGNUMP (key) ? hashfn_equal : hashfn_eq) (key, h); diff --git a/src/frame.c b/src/frame.c index 0ec7057db20..8f8df8f8e0d 100644 --- a/src/frame.c +++ b/src/frame.c @@ -335,7 +335,7 @@ DEFUN ("frame-windows-min-size", Fframe_windows_min_size, * additionally limit the minimum frame height to a value large enough * to support menu bar, tab bar, mode line and echo area. */ -int +static int frame_windows_min_size (Lisp_Object frame, Lisp_Object horizontal, Lisp_Object ignore, Lisp_Object pixelwise) { diff --git a/src/frame.h b/src/frame.h index 5d5f2122fbb..61df57e966a 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1338,8 +1338,6 @@ extern bool frame_inhibit_resize (struct frame *, bool, Lisp_Object); extern void adjust_frame_size (struct frame *, int, int, int, bool, Lisp_Object); extern Lisp_Object mouse_position (bool); -extern int frame_windows_min_size (Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object); extern void frame_size_history_plain (struct frame *, Lisp_Object); extern void frame_size_history_extra (struct frame *, Lisp_Object, int, int, int, int, int, int); diff --git a/src/gnutls.c b/src/gnutls.c index 09590ca005c..0e1e63e157a 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1521,7 +1521,7 @@ returned as the :certificate entry. */) /* Initialize global GnuTLS state to defaults. Call 'gnutls-global-deinit' when GnuTLS usage is no longer needed. Return zero on success. */ -Lisp_Object +static Lisp_Object emacs_gnutls_global_init (void) { int ret = GNUTLS_E_SUCCESS; diff --git a/src/gnutls.h b/src/gnutls.h index 791e5340c2d..19d3d3f5bc6 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -90,7 +90,6 @@ extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err); extern int w32_gnutls_rnd (gnutls_rnd_level_t, void *, size_t); #endif extern Lisp_Object emacs_gnutls_deinit (Lisp_Object); -extern Lisp_Object emacs_gnutls_global_init (void); extern int gnutls_try_handshake (struct Lisp_Process *p); extern Lisp_Object gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist); diff --git a/src/lisp.h b/src/lisp.h index bd3cdd5307e..9599934c1fa 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3910,8 +3910,6 @@ extern void hexbuf_digest (char *, void const *, int); extern char *extract_data_from_object (Lisp_Object, ptrdiff_t *, ptrdiff_t *); EMACS_UINT hash_string (char const *, ptrdiff_t); EMACS_UINT sxhash (Lisp_Object); -Lisp_Object hashfn_eql (Lisp_Object, struct Lisp_Hash_Table *); -Lisp_Object hashfn_equal (Lisp_Object, struct Lisp_Hash_Table *); Lisp_Object hashfn_user_defined (Lisp_Object, struct Lisp_Hash_Table *); Lisp_Object make_hash_table (struct hash_table_test, EMACS_INT, float, float, Lisp_Object, bool); diff --git a/src/minibuf.c b/src/minibuf.c index 49a474dd492..97a6ec69011 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -41,7 +41,7 @@ along with GNU Emacs. If not, see . */ minibuffer recursions are encountered. */ Lisp_Object Vminibuffer_list; -Lisp_Object Vcommand_loop_level_list; +static Lisp_Object Vcommand_loop_level_list; /* Data to remember during recursive minibuffer invocations. */ diff --git a/src/syntax.c b/src/syntax.c index 13c36fdf3cd..f9022d18d26 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1074,7 +1074,7 @@ unsigned char const syntax_spec_code[0400] = /* Indexed by syntax code, give the letter that describes it. */ -char const syntax_code_spec[16] = +static char const syntax_code_spec[16] = { ' ', '.', 'w', '_', '(', ')', '\'', '\"', '$', '\\', '/', '<', '>', '@', '!', '|' diff --git a/src/syntax.h b/src/syntax.h index c1bb9274d00..5949a95a73b 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -147,10 +147,6 @@ extern bool syntax_prefix_flag_p (int c); extern unsigned char const syntax_spec_code[0400]; -/* Indexed by syntax code, give the letter that describes it. */ - -extern char const syntax_code_spec[16]; - /* Convert the byte offset BYTEPOS into a character position, for the object recorded in gl_state with SETUP_SYNTAX_TABLE_FOR_OBJECT. diff --git a/src/systime.h b/src/systime.h index 41d728f1c29..75088bd4a62 100644 --- a/src/systime.h +++ b/src/systime.h @@ -91,7 +91,6 @@ extern Lisp_Object timespec_to_lisp (struct timespec); extern bool list4_to_timespec (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, struct timespec *); extern struct timespec lisp_time_argument (Lisp_Object); -extern AVOID time_overflow (void); extern double float_time (Lisp_Object); extern void init_timefns (void); extern void syms_of_timefns (void); diff --git a/src/timefns.c b/src/timefns.c index 9b5b090ba71..9e8592d35ac 100644 --- a/src/timefns.c +++ b/src/timefns.c @@ -342,7 +342,7 @@ init_timefns (void) } /* Report that a time value is out of range for Emacs. */ -void +static AVOID time_overflow (void) { error ("Specified time is not representable"); diff --git a/src/xterm.c b/src/xterm.c index fb0fc66ae59..4f8accbda3a 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -2339,6 +2339,68 @@ x_reset_clip_rectangles (struct frame *f, GC gc) #endif } +#ifdef HAVE_XRENDER +# if !defined USE_CAIRO && (RENDER_MAJOR > 0 || RENDER_MINOR >= 2) +static void +x_xrender_color_from_gc_foreground (struct frame *f, GC gc, XRenderColor *color, + bool apply_alpha_background) +{ + XGCValues xgcv; + XColor xc; + + XGetGCValues (FRAME_X_DISPLAY (f), gc, GCForeground, &xgcv); + xc.pixel = xgcv.foreground; + x_query_colors (f, &xc, 1); + + color->alpha = (apply_alpha_background + ? 65535 * f->alpha_background + : 65535); + + if (color->alpha == 65535) + { + color->red = xc.red; + color->blue = xc.blue; + color->green = xc.green; + } + else + { + color->red = (xc.red * color->alpha) / 65535; + color->blue = (xc.blue * color->alpha) / 65535; + color->green = (xc.green * color->alpha) / 65535; + } +} +# endif + +void +x_xrender_color_from_gc_background (struct frame *f, GC gc, XRenderColor *color, + bool apply_alpha_background) +{ + XGCValues xgcv; + XColor xc; + + XGetGCValues (FRAME_X_DISPLAY (f), gc, GCBackground, &xgcv); + xc.pixel = xgcv.background; + x_query_colors (f, &xc, 1); + + color->alpha = (apply_alpha_background + ? 65535 * f->alpha_background + : 65535); + + if (color->alpha == 65535) + { + color->red = xc.red; + color->blue = xc.blue; + color->green = xc.green; + } + else + { + color->red = (xc.red * color->alpha) / 65535; + color->blue = (xc.blue * color->alpha) / 65535; + color->green = (xc.green * color->alpha) / 65535; + } +} +#endif + static void x_fill_rectangle (struct frame *f, GC gc, int x, int y, int width, int height, bool respect_alpha_background) @@ -3299,7 +3361,7 @@ static void x_scroll_bar_clear (struct frame *); static void x_check_font (struct frame *, struct font *); #endif -void +static void x_display_set_last_user_time (struct x_display_info *dpyinfo, Time time) { #ifndef USE_GTK @@ -19311,66 +19373,6 @@ init_xterm (void) } #endif -#ifdef HAVE_XRENDER -void -x_xrender_color_from_gc_foreground (struct frame *f, GC gc, XRenderColor *color, - bool apply_alpha_background) -{ - XGCValues xgcv; - XColor xc; - - XGetGCValues (FRAME_X_DISPLAY (f), gc, GCForeground, &xgcv); - xc.pixel = xgcv.foreground; - x_query_colors (f, &xc, 1); - - color->alpha = (apply_alpha_background - ? 65535 * f->alpha_background - : 65535); - - if (color->alpha == 65535) - { - color->red = xc.red; - color->blue = xc.blue; - color->green = xc.green; - } - else - { - color->red = (xc.red * color->alpha) / 65535; - color->blue = (xc.blue * color->alpha) / 65535; - color->green = (xc.green * color->alpha) / 65535; - } -} - -void -x_xrender_color_from_gc_background (struct frame *f, GC gc, XRenderColor *color, - bool apply_alpha_background) -{ - XGCValues xgcv; - XColor xc; - - XGetGCValues (FRAME_X_DISPLAY (f), gc, GCBackground, &xgcv); - xc.pixel = xgcv.background; - x_query_colors (f, &xc, 1); - - color->alpha = (apply_alpha_background - ? 65535 * f->alpha_background - : 65535); - - if (color->alpha == 65535) - { - color->red = xc.red; - color->blue = xc.blue; - color->green = xc.green; - } - else - { - color->red = (xc.red * color->alpha) / 65535; - color->blue = (xc.blue * color->alpha) / 65535; - color->green = (xc.green * color->alpha) / 65535; - } -} -#endif - void syms_of_xterm (void) { diff --git a/src/xterm.h b/src/xterm.h index 05d5e08dc01..ed612c3c1e9 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -1361,8 +1361,6 @@ extern Lisp_Object x_cr_export_frames (Lisp_Object, cairo_surface_type_t); #endif #ifdef HAVE_XRENDER -extern void x_xrender_color_from_gc_foreground (struct frame *, GC, - XRenderColor *, bool); extern void x_xrender_color_from_gc_background (struct frame *, GC, XRenderColor *, bool); extern void x_xr_ensure_picture (struct frame *f); @@ -1374,8 +1372,6 @@ extern void x_xr_reset_ext_clip (struct frame *f); extern void x_scroll_bar_configure (GdkEvent *); #endif -extern void x_display_set_last_user_time (struct x_display_info *, Time); - extern Lisp_Object x_dnd_begin_drag_and_drop (struct frame *, Time, Atom, bool); extern void x_set_dnd_targets (Atom *, int);