diff src/glyphs-x.c @ 2286:04bc9d2f42c7

[xemacs-hg @ 2004-09-20 19:18:55 by james] Mark all unused parameters as unused. Also eliminate some unneeded local variables.
author james
date Mon, 20 Sep 2004 19:20:08 +0000
parents 7473844a83d3
children ecf1ebac70d8
line wrap: on
line diff
--- a/src/glyphs-x.c	Mon Sep 20 19:11:29 2004 +0000
+++ b/src/glyphs-x.c	Mon Sep 20 19:20:08 2004 +0000
@@ -356,7 +356,7 @@
 static void
 x_print_image_instance (Lisp_Image_Instance *p,
 			Lisp_Object printcharfun,
-			int escapeflag)
+			int UNUSED (escapeflag))
 {
   switch (IMAGE_INSTANCE_TYPE (p))
     {
@@ -476,7 +476,7 @@
 
 static int
 x_image_instance_equal (Lisp_Image_Instance *p1,
-			Lisp_Image_Instance *p2, int depth)
+			Lisp_Image_Instance *p2, int UNUSED (depth))
 {
   switch (IMAGE_INSTANCE_TYPE (p1))
     {
@@ -495,7 +495,7 @@
 }
 
 static Hashcode
-x_image_instance_hash (Lisp_Image_Instance *p, int depth)
+x_image_instance_hash (Lisp_Image_Instance *p, int UNUSED (depth))
 {
   switch (IMAGE_INSTANCE_TYPE (p))
     {
@@ -846,7 +846,7 @@
 				   UChar_Binary *eimage,
 				   int dest_mask,
 				   Lisp_Object instantiator,
-				   Lisp_Object domain)
+				   Lisp_Object UNUSED (domain))
 {
   Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
   Colormap cmap = DEVICE_X_COLORMAP (XDEVICE(device));
@@ -914,7 +914,7 @@
 				     Lisp_Object pointer_bg,
 				     int dest_mask,
 				     Pixmap mask,
-				     Lisp_Object mask_filename)
+				     Lisp_Object UNUSED (mask_filename))
 {
   Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
   Lisp_Object foreground = find_keyword_in_vector (instantiator, Q_foreground);
@@ -1074,7 +1074,7 @@
 static void
 x_xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		   Lisp_Object pointer_fg, Lisp_Object pointer_bg,
-		   int dest_mask, Lisp_Object domain)
+		   int dest_mask, Lisp_Object UNUSED (domain))
 {
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
   Char_Binary *ext_data;
@@ -1558,7 +1558,7 @@
 static void
 x_xface_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		     Lisp_Object pointer_fg, Lisp_Object pointer_bg,
-		     int dest_mask, Lisp_Object domain)
+		     int dest_mask, Lisp_Object UNUSED (domain))
 {
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
   int i, stattis;
@@ -1635,7 +1635,7 @@
 static Lisp_Object
 autodetect_normalize (Lisp_Object instantiator,
 		      Lisp_Object console_type,
-		      Lisp_Object dest_mask)
+		      Lisp_Object UNUSED (dest_mask))
 {
   Lisp_Object file = find_keyword_in_vector (instantiator, Q_data);
   Lisp_Object filename = Qnil;
@@ -1796,7 +1796,7 @@
 static int XLoadFont_got_error;
 
 static int
-XLoadFont_error_handler (Display *dpy, XErrorEvent *xerror)
+XLoadFont_error_handler (Display *UNUSED (dpy), XErrorEvent *UNUSED (xerror))
 {
   XLoadFont_got_error = 1;
   return 0;
@@ -1829,7 +1829,7 @@
 static void
 font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		  Lisp_Object pointer_fg, Lisp_Object pointer_bg,
-		  int dest_mask, Lisp_Object domain)
+		  int dest_mask, Lisp_Object UNUSED (domain))
 {
   /* This function can GC */
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
@@ -1927,7 +1927,7 @@
 static void
 cursor_font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 			 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
-			 int dest_mask, Lisp_Object domain)
+			 int dest_mask, Lisp_Object UNUSED (domain))
 {
   /* This function can GC */
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
@@ -2205,9 +2205,11 @@
 
 /* instantiate and x type subwindow */
 static void
-x_subwindow_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
-			Lisp_Object pointer_fg, Lisp_Object pointer_bg,
-			int dest_mask, Lisp_Object domain)
+x_subwindow_instantiate (Lisp_Object image_instance,
+			 Lisp_Object UNUSED (instantiator),
+			 Lisp_Object UNUSED (pointer_fg),
+			 Lisp_Object UNUSED (pointer_bg),
+			 int UNUSED (dest_mask), Lisp_Object domain)
 {
   /* This function can GC */
   Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
@@ -2374,9 +2376,11 @@
 }
 
 static void
-x_widget_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
-		      Lisp_Object pointer_fg, Lisp_Object pointer_bg,
-		      int dest_mask, Lisp_Object domain,
+x_widget_instantiate (Lisp_Object image_instance,
+		      Lisp_Object UNUSED (instantiator),
+		      Lisp_Object UNUSED (pointer_fg),
+		      Lisp_Object UNUSED (pointer_bg),
+		      int UNUSED (dest_mask), Lisp_Object domain,
 		      const char* type, widget_value* wv)
 {
   Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);