# HG changeset patch
# User james
# Date 1095195277 0
# Node ID 4ec724310f3360b88f8b0e483bc94e4e2e6466fe
# Parent  0dfff19d20da3ba3cc6b99a0336527c830e47fd8
[xemacs-hg @ 2004-09-14 20:54:29 by james]
Eliminate gcc shadow warnings.

diff -r 0dfff19d20da -r 4ec724310f33 modules/ChangeLog
--- a/modules/ChangeLog	Tue Sep 14 20:26:46 2004 +0000
+++ b/modules/ChangeLog	Tue Sep 14 20:54:37 2004 +0000
@@ -1,3 +1,8 @@
+2004-09-14  Jerry James  <james@xemacs.org>
+
+	* ldap/eldap.c (Fldap_open): Change ldap_passwd to ldap_password
+	to eliminate a gcc shadow warning.
+
 2004-09-13  Jerry James  <james@xemacs.org>
 
 	* ldap/eldap.c (signal_ldap_error): Mark as noreturn.
diff -r 0dfff19d20da -r 4ec724310f33 modules/ldap/eldap.c
--- a/modules/ldap/eldap.c	Tue Sep 14 20:26:46 2004 +0000
+++ b/modules/ldap/eldap.c	Tue Sep 14 20:54:37 2004 +0000
@@ -218,7 +218,7 @@
   int  ldap_port = 0;
   int  ldap_auth = LDAP_AUTH_SIMPLE;
   char *ldap_binddn = NULL;
-  char *ldap_passwd = NULL;
+  char *ldap_password = NULL;
   int  ldap_deref = LDAP_DEREF_NEVER;
   int  ldap_timelimit = 0;
   int  ldap_sizelimit = 0;
@@ -261,7 +261,7 @@
 	else if (EQ (keyword, Qpasswd))
 	  {
 	    CHECK_STRING (value);
-	    LISP_STRING_TO_EXTERNAL (value, ldap_passwd, Qnative);
+	    LISP_STRING_TO_EXTERNAL (value, ldap_password, Qnative);
 	  }
 	/* Deref */
 	else if (EQ (keyword, Qderef))
@@ -334,7 +334,7 @@
   ld->ld_options |= LDAP_OPT_RESTART;
 #endif /* not HAVE_LDAP_SET_OPTION */
 
-  err = ldap_bind_s (ld, ldap_binddn, ldap_passwd, ldap_auth);
+  err = ldap_bind_s (ld, ldap_binddn, ldap_password, ldap_auth);
   if (err != LDAP_SUCCESS)
     {
       Ibyte *interrmess;
diff -r 0dfff19d20da -r 4ec724310f33 src/ChangeLog
--- a/src/ChangeLog	Tue Sep 14 20:26:46 2004 +0000
+++ b/src/ChangeLog	Tue Sep 14 20:54:37 2004 +0000
@@ -1,3 +1,12 @@
+2004-09-14  Jerry James  <james@xemacs.org>
+
+	* doprnt.c (emacs_doprnt_1): Change message to msg to eliminate a
+	gcc shadow warning.
+	* glyphs-gtk.c:
+	* glyphs.h:
+	Use enum image_instance_type and do not typedef the enum to
+	image_instance_type to eliminate a gcc shadow warning.
+
 2004-09-14  Jerry James  <james@xemacs.org>
 
 	* linuxplay.c (linux_play_data_or_file): Fix type punning
diff -r 0dfff19d20da -r 4ec724310f33 src/doprnt.c
--- a/src/doprnt.c	Tue Sep 14 20:26:46 2004 +0000
+++ b/src/doprnt.c	Tue Sep 14 20:54:37 2004 +0000
@@ -598,11 +598,11 @@
 #endif
 		{
 		  /* WARNING!  This MUST be big enough for the sprintf below */
-		  CIbyte message[48];
-		  sprintf (message,
+		  CIbyte msg[48];
+		  sprintf (msg,
 			   "format specifier %%%c doesn't match argument type",
 			   ch);
-		  syntax_error (message, Qnil);
+		  syntax_error (msg, Qnil);
 		}
 	      else if (strchr (double_converters, ch))
 		{
@@ -720,10 +720,10 @@
 	      if (!valid_ichar_p (a))
 		{
 		  /* WARNING!  This MUST be big enough for the sprintf below */
-		  CIbyte message[60];
-		  sprintf (message, "invalid character value %d to %%c spec",
+		  CIbyte msg[60];
+		  sprintf (msg, "invalid character value %d to %%c spec",
 			   a);
-		  syntax_error (message, Qnil);
+		  syntax_error (msg, Qnil);
 		}
 
 	      charlen = set_itext_ichar (charbuf, a);
diff -r 0dfff19d20da -r 4ec724310f33 src/glyphs-gtk.c
--- a/src/glyphs-gtk.c	Tue Sep 14 20:26:46 2004 +0000
+++ b/src/glyphs-gtk.c	Tue Sep 14 20:54:37 2004 +0000
@@ -1429,7 +1429,8 @@
 
 extern guint symbol_to_enum (Lisp_Object, GtkType);
 
-static guint resource_name_to_resource (Lisp_Object name, image_instance_type type)
+static guint resource_name_to_resource (Lisp_Object name,
+					enum image_instance_type type)
 {
   if (type == IMAGE_POINTER)
     return (symbol_to_enum (name, GTK_TYPE_GDK_CURSOR_TYPE));
@@ -1437,7 +1438,7 @@
     return (0);
 }
 
-static image_instance_type
+static enum image_instance_type
 resource_symbol_to_type (Lisp_Object data)
 {
   if (EQ (data, Qcursor))
@@ -1459,7 +1460,7 @@
 {
   struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
   GdkCursor *c = NULL;
-  image_instance_type type;
+  enum image_instance_type type;
   Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
   Lisp_Object resource_type = find_keyword_in_vector (instantiator, Q_resource_type);
   Lisp_Object resource_id = find_keyword_in_vector (instantiator, Q_resource_id);
diff -r 0dfff19d20da -r 4ec724310f33 src/glyphs.h
--- a/src/glyphs.h	Tue Sep 14 20:26:46 2004 +0000
+++ b/src/glyphs.h	Tue Sep 14 20:54:37 2004 +0000
@@ -460,7 +460,6 @@
   IMAGE_SUBWINDOW,
   IMAGE_WIDGET
 };
-typedef enum image_instance_type image_instance_type;
 
 #define IMAGE_NOTHING_MASK (1 << 0)
 #define IMAGE_TEXT_MASK (1 << 1)