[AC 21.5] Warning fixes

[Jerry James]

APPROVE COMMIT 21.5

This patch makes gcc stop warning about some suspect constructs in our code.

diff -r db7068430402 modules/ChangeLog
--- a/modules/ChangeLog	Mon Oct 05 11:08:59 2009 -0600
+++ b/modules/ChangeLog	Mon Oct 05 13:04:45 2009 -0600
@@ -1,3 +1,9 @@
+2009-10-05  Jerry James  <james at xemacs.org>
+
+	* ldap/eldap.c (Fldap_search_basic): quiet gcc warnings due to
+	NEW_LISP_STRING_TO_EXTERNAL modifying a variable while computing a
+	result to be passed as a parameter.
+
 2009-05-18  Stephen J. Turnbull  <stephen at xemacs.org>

 	* XEmacs 21.5.29 "garbanzo" is released.
diff -r db7068430402 modules/ldap/eldap.c
--- a/modules/ldap/eldap.c	Mon Oct 05 11:08:59 2009 -0600
+++ b/modules/ldap/eldap.c	Mon Oct 05 13:04:45 2009 -0600
@@ -425,7 +425,7 @@
   LDAP *ld;
   LDAPMessage *e;
   BerElement *ptr;
-  Extbyte *a, *dn;
+  Extbyte *a, *dn, *bs, *filt;
   int i, rc;
   int  matches;
   struct ldap_unwind_struct unwind;
@@ -497,14 +497,10 @@
   CHECK_SYMBOL (attrsonly);

   /* Perform the search */
-  if (ldap_search (ld,
-                   NILP (base) ? "" :
-		   NEW_LISP_STRING_TO_EXTERNAL (base, Qnative),
-                   ldap_scope,
-                   NILP (filter) ? "" :
-		   NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative),
-                   ldap_attributes,
-                   NILP (attrsonly) ? 0 : 1)
+  bs = NILP (base) ? "" : NEW_LISP_STRING_TO_EXTERNAL (base, Qnative);
+  filt = NILP (filter) ? "" : NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative);
+  if (ldap_search (ld, bs, ldap_scope, filt, ldap_attributes,
+		   NILP (attrsonly) ? 0 : 1)
       == -1)
     {
       signal_ldap_error (ld, NULL, 0);
diff -r db7068430402 src/ChangeLog
--- a/src/ChangeLog	Mon Oct 05 11:08:59 2009 -0600
+++ b/src/ChangeLog	Mon Oct 05 13:04:45 2009 -0600
@@ -1,3 +1,14 @@
+2009-10-05  Jerry James  <james at xemacs.org>
+
+	* emacs.c (main_1): Check the return value of dup() to quiet gcc.
+	* input-method-xlib.c (describe_Window): Check the return value of
+	system() to quiet gcc.
+	* objects-tty.c (UNUSED_IF_NEW_GC): New macro.
+	(tty_finalize_color_instance): Use it to quiet gcc.
+	(tty_finalize_font_instance): Ditto.
+	* syntax.c (UNUSED_IF_NEW_GC): New macro.
+	(uninit_buffer_syntax_cache): Use it to quiet gcc.
+
 2009-10-05  Jerry James  <james at xemacs.org>

 	* glade.c: Add GPL v2 or later notice with explicit permission of
diff -r db7068430402 src/emacs.c
--- a/src/emacs.c	Mon Oct 05 11:08:59 2009 -0600
+++ b/src/emacs.c	Mon Oct 05 13:04:45 2009 -0600
@@ -1240,9 +1240,8 @@
 	fd = wext_retry_open (term, O_RDWR | OPEN_BINARY, 2);
 	/* Conversions are not possible yet, and printing will be in
 	   external format, so strerror() and ttyname() are OK. */
-	if (fd < 0)
+	if (fd < 0 || dup (0) < 0)
 	  fatal ("%s: %s", WEXTTEXT_TO_8_BIT (term), strerror (errno));
-	dup (0);
 	if (! isatty (0))
 	  fatal ("%s: not a tty", WEXTTEXT_TO_8_BIT (term));

diff -r db7068430402 src/input-method-xlib.c
--- a/src/input-method-xlib.c	Mon Oct 05 11:08:59 2009 -0600
+++ b/src/input-method-xlib.c	Mon Oct 05 13:04:45 2009 -0600
@@ -895,7 +895,8 @@
   char xwincmd[128];
   sprintf (xwincmd, "xwininfo -id 0x%x >&2; xwininfo -events -id 0x%x >&2",
            (int) win, (int) win);
-  system (xwincmd);
+  if (system (xwincmd) == -1)
+    stderr_out ("Unable to execute xwininfo\n");
 }

 void
diff -r db7068430402 src/objects-tty.c
--- a/src/objects-tty.c	Mon Oct 05 11:08:59 2009 -0600
+++ b/src/objects-tty.c	Mon Oct 05 13:04:45 2009 -0600
@@ -30,6 +30,12 @@
 #include "device.h"
 #include "charset.h"

+#ifdef NEW_GC
+# define UNUSED_IF_NEW_GC(decl) UNUSED (decl)
+#else
+# define UNUSED_IF_NEW_GC(decl) decl
+#endif
+
 /* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */
 Lisp_Object Vtty_color_alist;
 #if 0 /* This stuff doesn't quite work yet */
@@ -219,7 +225,7 @@
 }

 static void
-tty_finalize_color_instance (Lisp_Color_Instance *c)
+tty_finalize_color_instance (Lisp_Color_Instance *UNUSED_IF_NEW_GC (c))
 {
 #ifndef NEW_GC
   if (c->data)
@@ -314,7 +320,7 @@
 }

 static void
-tty_finalize_font_instance (Lisp_Font_Instance *f)
+tty_finalize_font_instance (Lisp_Font_Instance *UNUSED_IF_NEW_GC (f))
 {
 #ifndef NEW_GC
   if (f->data)
diff -r db7068430402 src/syntax.c
--- a/src/syntax.c	Mon Oct 05 11:08:59 2009 -0600
+++ b/src/syntax.c	Mon Oct 05 13:04:45 2009 -0600
@@ -31,6 +31,12 @@
 #include "syntax.h"
 #include "extents.h"

+#ifdef NEW_GC
+# define UNUSED_IF_NEW_GC(decl) UNUSED (decl)
+#else
+# define UNUSED_IF_NEW_GC(decl) decl
+#endif
+
 #define ST_COMMENT_STYLE 0x101
 #define ST_STRING_STYLE  0x102

@@ -540,7 +546,7 @@
 /* finalize the syntax cache for BUF */

 void
-uninit_buffer_syntax_cache (struct buffer *buf)
+uninit_buffer_syntax_cache (struct buffer *UNUSED_IF_NEW_GC (buf))
 {
 #ifndef NEW_GC
   xfree (buf->syntax_cache, struct syntax_cache *);

-- 
Jerry James
http://www.jamezone.org/