src/*.c: Fix more warnings about unused parameters.

* keymap.c (describe_vector): Remove parameters `indices' and
  `char_table_depth', unused since 2002-03-01T01:43:26Z!handa@m17n.org.
  (describe_map, Fdescribe_vector): Adjust calls to `describe_vector'.

* w32.c (read_unc_volume): Use parameter `henum', instead of
  global variable `wget_enum_handle'.

diff --git a/src/ChangeLog b/src/ChangeLog
index 69e850610bc4adcf9c0cae9fca5f1ddf39401375..cc40c863e970f27306edb560f7f39c5bf0078790 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2011-03-26  Juanma Barranquero  <lekktu@gmail.com>
 
+       * w32.c (read_unc_volume): Use parameter `henum', instead of
+       global variable `wget_enum_handle'.
+
+       * keymap.c (describe_vector): Remove parameters `indices' and
+       `char_table_depth', unused since 2002-03-01T01:43:26Z!handa@m17n.org.
+       (describe_map, Fdescribe_vector): Adjust calls to `describe_vector'.
+
        * keyboard.h (timer_check, show_help_echo): Remove unused parameters.
 
        * keyboard.c (timer_check): Remove parameter `do_it_now',

diff --git a/src/keymap.c b/src/keymap.c
index 06968a0d9445cfd3dd3a863ba3c27e6f53b77eca..440df06ba4ee178beb369762513bdc78fed90989 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -81,8 +81,7 @@ static void describe_map (Lisp_Object, Lisp_Object,
                          int, Lisp_Object, Lisp_Object*, int, int);
 static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object,
                              void (*) (Lisp_Object, Lisp_Object), int,
-                             Lisp_Object, Lisp_Object, int *,
-                             int, int, int);
+                             Lisp_Object, Lisp_Object, int, int);
 static void silly_event_symbol_error (Lisp_Object);
 static Lisp_Object get_keyelt (Lisp_Object, int);
 \f
@@ -3353,7 +3352,7 @@ describe_map (Lisp_Object map, Lisp_Object prefix,
          || CHAR_TABLE_P (XCAR (tail)))
        describe_vector (XCAR (tail),
                         prefix, Qnil, elt_describer, partial, shadow, map,
-                        (int *)0, 0, 1, mention_shadow);
+                        1, mention_shadow);
       else if (CONSP (XCAR (tail)))
        {
          int this_shadowed = 0;
@@ -3506,7 +3505,7 @@ DESCRIBER is the output function used; nil means use `princ'.  */)
   specbind (Qstandard_output, Fcurrent_buffer ());
   CHECK_VECTOR_OR_CHAR_TABLE (vector);
   describe_vector (vector, Qnil, describer, describe_vector_princ, 0,
-                  Qnil, Qnil, (int *)0, 0, 0, 0);
+                  Qnil, Qnil, 0, 0);
 
   return unbind_to (count, Qnil);
 }
@@ -3539,9 +3538,6 @@ DESCRIBER is the output function used; nil means use `princ'.  */)
 
    ARGS is simply passed as the second argument to ELT_DESCRIBER.
 
-   INDICES and CHAR_TABLE_DEPTH are ignored.  They will be removed in
-   the near future.
-
    KEYMAP_P is 1 if vector is known to be a keymap, so map ESC to M-.
 
    ARGS is simply passed as the second argument to ELT_DESCRIBER.  */
@@ -3550,8 +3546,7 @@ static void
 describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
                 void (*elt_describer) (Lisp_Object, Lisp_Object),
                 int partial, Lisp_Object shadow, Lisp_Object entire_map,
-                int *indices, int char_table_depth, int keymap_p,
-                int mention_shadow)
+                int keymap_p, int mention_shadow)
 {
   Lisp_Object definition;
   Lisp_Object tem2;

diff --git a/src/w32.c b/src/w32.c
index bbf777b2e1de8bf4e2eaace0ec95d7178b6ae394..5643b3f073e7b64bb7309f3258de92f16b8949e0 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -2376,8 +2376,8 @@ readdir (DIR *dirp)
   if (wnet_enum_handle != INVALID_HANDLE_VALUE)
     {
       if (!read_unc_volume (wnet_enum_handle,
-                             dir_find_data.cFileName,
-                             MAX_PATH))
+                            dir_find_data.cFileName,
+                            MAX_PATH))
        return NULL;
     }
   /* If we aren't dir_finding, do a find-first, otherwise do a find-next. */
@@ -2487,7 +2487,7 @@ read_unc_volume (HANDLE henum, char *readbuf, int size)
 
   count = 1;
   buffer = alloca (bufsize);
-  result = WNetEnumResource (wnet_enum_handle, &count, buffer, &bufsize);
+  result = WNetEnumResource (henum, &count, buffer, &bufsize);
   if (result != NO_ERROR)
     return NULL;