[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117895: Fix minor problems found by static checking
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r117895: Fix minor problems found by static checking. |
Date: |
Wed, 17 Sep 2014 18:27:45 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117895
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-09-17 11:27:36 -0700
message:
Fix minor problems found by static checking.
* alloc.c, lisp.h (SAVE_TYPE_INT_OBJ, make_save_int_obj):
Remove; now unused.
* buffer.h (decode_buffer): Doc and indentation fixes.
* fns.c (Qstring_collate_lessp, Qstring_collate_equalp): Now static.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/alloc.c alloc.c-20091113204419-o5vbwnq5f7feedwu-252
src/buffer.h buffer.h-20091113204419-o5vbwnq5f7feedwu-196
src/fns.c fns.c-20091113204419-o5vbwnq5f7feedwu-203
src/lisp.h lisp.h-20091113204419-o5vbwnq5f7feedwu-253
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-09-17 15:34:37 +0000
+++ b/src/ChangeLog 2014-09-17 18:27:36 +0000
@@ -1,3 +1,11 @@
+2014-09-17 Paul Eggert <address@hidden>
+
+ Fix minor problems found by static checking.
+ * alloc.c, lisp.h (SAVE_TYPE_INT_OBJ, make_save_int_obj):
+ Remove; now unused.
+ * buffer.h (decode_buffer): Doc and indentation fixes.
+ * fns.c (Qstring_collate_lessp, Qstring_collate_equalp): Now static.
+
2014-09-17 Dmitry Antipov <address@hidden>
Avoid clang-specific warnings.
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2014-09-17 11:22:45 +0000
+++ b/src/alloc.c 2014-09-17 18:27:36 +0000
@@ -3657,17 +3657,6 @@
return val;
}
-Lisp_Object
-make_save_int_obj (ptrdiff_t a, Lisp_Object b)
-{
- Lisp_Object val = allocate_misc (Lisp_Misc_Save_Value);
- struct Lisp_Save_Value *p = XSAVE_VALUE (val);
- p->save_type = SAVE_TYPE_INT_OBJ;
- p->data[0].integer = a;
- p->data[1].object = b;
- return val;
-}
-
#if ! (defined USE_X_TOOLKIT || defined USE_GTK)
Lisp_Object
make_save_ptr_ptr (void *a, void *b)
=== modified file 'src/buffer.h'
--- a/src/buffer.h 2014-09-07 07:04:01 +0000
+++ b/src/buffer.h 2014-09-17 18:27:36 +0000
@@ -1088,8 +1088,9 @@
extern void restore_buffer (Lisp_Object);
extern void set_buffer_if_live (Lisp_Object);
-INLINE
-struct buffer *
+/* Return B as a struct buffer pointer, defaulting to the current buffer. */
+
+INLINE struct buffer *
decode_buffer (Lisp_Object b)
{
return NILP (b) ? current_buffer : (CHECK_BUFFER (b), XBUFFER (b));
=== modified file 'src/fns.c'
--- a/src/fns.c 2014-09-16 13:07:57 +0000
+++ b/src/fns.c 2014-09-17 18:27:36 +0000
@@ -41,7 +41,8 @@
#include "xterm.h"
#endif
-Lisp_Object Qstring_lessp, Qstring_collate_lessp, Qstring_collate_equalp;
+Lisp_Object Qstring_lessp;
+static Lisp_Object Qstring_collate_lessp, Qstring_collate_equalp;
static Lisp_Object Qprovide, Qrequire;
static Lisp_Object Qyes_or_no_p_history;
Lisp_Object Qcursor_in_echo_area;
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2014-09-15 14:53:23 +0000
+++ b/src/lisp.h 2014-09-17 18:27:36 +0000
@@ -1967,7 +1967,6 @@
SAVE_TYPE_OBJ_OBJ_OBJ_OBJ
= SAVE_OBJECT + (SAVE_TYPE_OBJ_OBJ_OBJ << SAVE_SLOT_BITS),
SAVE_TYPE_PTR_INT = SAVE_POINTER + (SAVE_INTEGER << SAVE_SLOT_BITS),
- SAVE_TYPE_INT_OBJ = SAVE_INTEGER + (SAVE_OBJECT << SAVE_SLOT_BITS),
SAVE_TYPE_PTR_OBJ = SAVE_POINTER + (SAVE_OBJECT << SAVE_SLOT_BITS),
SAVE_TYPE_PTR_PTR = SAVE_POINTER + (SAVE_POINTER << SAVE_SLOT_BITS),
SAVE_TYPE_FUNCPTR_PTR_OBJ
@@ -3798,7 +3797,6 @@
extern Lisp_Object make_save_ptr (void *);
extern Lisp_Object make_save_ptr_int (void *, ptrdiff_t);
extern Lisp_Object make_save_ptr_ptr (void *, void *);
-extern Lisp_Object make_save_int_obj (ptrdiff_t, Lisp_Object);
extern Lisp_Object make_save_funcptr_ptr_obj (void (*) (void), void *,
Lisp_Object);
extern Lisp_Object make_save_memory (Lisp_Object *, ptrdiff_t);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117895: Fix minor problems found by static checking.,
Paul Eggert <=