From 946f9a5b0a6df7470868acb8b39ad10b0866f73e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 15 Mar 2011 16:03:11 -0700 Subject: * data.c (Findirect_variable): Name an expression, to avoid gcc -Wbad-function-cast warning. --- src/data.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index d0afca6a09f..288525cf5f5 100644 --- a/src/data.c +++ b/src/data.c @@ -805,7 +805,10 @@ variable chain of symbols. */) (Lisp_Object object) { if (SYMBOLP (object)) - XSETSYMBOL (object, indirect_variable (XSYMBOL (object))); + { + struct Lisp_Symbol *sym = indirect_variable (XSYMBOL (object)); + XSETSYMBOL (object, sym); + } return object; } -- cgit v1.2.1 From 112396d6542186a88963e08828cd66f6d7fe9543 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 15 Mar 2011 16:06:01 -0700 Subject: * data.c (default_value, arithcompare, arith_driver, arith_error): Now static. --- src/data.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 288525cf5f5..81c16fff489 100644 --- a/src/data.c +++ b/src/data.c @@ -1272,7 +1272,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register /* Return the default value of SYMBOL, but don't check for voidness. Return Qunbound if it is void. */ -Lisp_Object +static Lisp_Object default_value (Lisp_Object symbol) { struct Lisp_Symbol *sym; @@ -2219,7 +2219,7 @@ bool-vector. IDX starts at 0. */) enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal }; -Lisp_Object +static Lisp_Object arithcompare (Lisp_Object num1, Lisp_Object num2, enum comparison comparison) { double f1 = 0, f2 = 0; @@ -2487,7 +2487,7 @@ enum arithop static Lisp_Object float_arith_driver (double, int, enum arithop, int, Lisp_Object *); -Lisp_Object +static Lisp_Object arith_driver (enum arithop code, int nargs, register Lisp_Object *args) { register Lisp_Object val; @@ -3311,7 +3311,7 @@ syms_of_data (void) XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1; } -SIGTYPE +static SIGTYPE arith_error (int signo) { sigsetmask (SIGEMPTYMASK); -- cgit v1.2.1 From b9b84fa9b19f892520aa9fe3479d3da03a9b0da6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 15 Mar 2011 16:07:15 -0700 Subject: * data.c (store_symval_forwarding): Rename local to avoid shadowing. --- src/data.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 81c16fff489..50a6ac219c4 100644 --- a/src/data.c +++ b/src/data.c @@ -910,12 +910,12 @@ store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) { - Lisp_Object buf; + Lisp_Object lbuf; struct buffer *b; - buf = Fcdr (XCAR (tail)); - if (!BUFFERP (buf)) continue; - b = XBUFFER (buf); + lbuf = Fcdr (XCAR (tail)); + if (!BUFFERP (lbuf)) continue; + b = XBUFFER (lbuf); if (! PER_BUFFER_VALUE_P (b, idx)) PER_BUFFER_VALUE (b, offset) = newval; -- cgit v1.2.1 From cdef261f74c8cf58a9b9c678e730a59b009ddad9 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 15 Mar 2011 16:20:25 -0700 Subject: * data.c (Fmake_variable_buffer_local, Fmake_local_variable): Mark variables as initialized. --- src/data.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 50a6ac219c4..6599d8fdfa3 100644 --- a/src/data.c +++ b/src/data.c @@ -1506,8 +1506,8 @@ The function `default-value' gets the default value and `set-default' sets it. { struct Lisp_Symbol *sym; struct Lisp_Buffer_Local_Value *blv = NULL; - union Lisp_Val_Fwd valcontents; - int forwarded; + union Lisp_Val_Fwd valcontents IF_LINT (= {0}); + int forwarded IF_LINT (= 0); CHECK_SYMBOL (variable); sym = XSYMBOL (variable); @@ -1582,8 +1582,8 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */) (register Lisp_Object variable) { register Lisp_Object tem; - int forwarded; - union Lisp_Val_Fwd valcontents; + int forwarded IF_LINT (= 0); + union Lisp_Val_Fwd valcontents IF_LINT (= {0}); struct Lisp_Symbol *sym; struct Lisp_Buffer_Local_Value *blv = NULL; -- cgit v1.2.1 From 527469183746cf04ee8212f9debc96e56f4748be Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 15 Mar 2011 16:22:38 -0700 Subject: * data.c (do_blv_forwarding, do_symval_forwarding): Remove; unused. --- src/data.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 6599d8fdfa3..01aafbcede4 100644 --- a/src/data.c +++ b/src/data.c @@ -818,9 +818,6 @@ variable chain of symbols. */) This does not handle buffer-local variables; use swap_in_symval_forwarding for that. */ -#define do_blv_forwarding(blv) \ - ((blv)->forwarded ? do_symval_forwarding (BLV_FWD (blv)) : BLV_VALUE (blv)) - Lisp_Object do_symval_forwarding (register union Lisp_Fwd *valcontents) { @@ -867,14 +864,6 @@ do_symval_forwarding (register union Lisp_Fwd *valcontents) BUF non-zero means set the value in buffer BUF instead of the current buffer. This only plays a role for per-buffer variables. */ -#define store_blv_forwarding(blv, newval, buf) \ - do { \ - if ((blv)->forwarded) \ - store_symval_forwarding (BLV_FWD (blv), (newval), (buf)); \ - else \ - SET_BLV_VALUE (blv, newval); \ - } while (0) - static void store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf) { -- cgit v1.2.1