[Emacs-diffs] /srv/bzr/emacs/trunk r104387: Merge: Fix minor problems prompted by GCC 4.6.0 warnings.

[Paul Eggert]

------------------------------------------------------------
revno: 104387 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-27 12:32:43 -0700
message:
  Merge: Fix minor problems prompted by GCC 4.6.0 warnings.
modified:
  src/ChangeLog
  src/fns.c
  src/xselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-27 16:17:59 +0000
+++ b/src/ChangeLog     2011-05-27 19:32:01 +0000
@@ -1,3 +1,14 @@
+2011-05-27  Paul Eggert  <address@hidden>
+
+       * xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings.
+       (x_handle_selection_request, frame_for_x_selection): Remove unused vars.
+       (x_clipboard_manager_save): Now static.
+       (Fx_clipboard_manager_save): Rename local to avoid shadowing.
+
+       * fns.c: Fix minor problems prompted by GCC 4.6.0 warnings.
+       (crypto_hash_function): Now static.
+       Fix pointer signedness problems.  Avoid unnecessary initializations.
+
 2011-05-27  Chong Yidong  <address@hidden>
 
        * termhooks.h (Vselection_alist): Make it terminal-local.

=== modified file 'src/fns.c'
--- a/src/fns.c 2011-05-24 08:22:58 +0000
+++ b/src/fns.c 2011-05-27 19:30:12 +0000
@@ -4522,7 +4522,7 @@
 
 /* TYPE: 0 for md5, 1 for sha1. */
 
-Lisp_Object
+static Lisp_Object
 crypto_hash_function (int type, Lisp_Object object, Lisp_Object start, 
Lisp_Object end, Lisp_Object coding_system, Lisp_Object noerror, Lisp_Object 
binary)
 {
   int i;
@@ -4708,17 +4708,16 @@
     {
     case 0:                    /* MD5 */
       {
-       unsigned char digest[16];
+       char digest[16];
        md5_buffer (SSDATA (object) + start_byte,
                    SBYTES (object) - (size_byte - end_byte),
                    digest);
 
-       if (NILP(binary))
+       if (NILP (binary))
          {
-           unsigned char value[33];
+           char value[33];
            for (i = 0; i < 16; i++)
              sprintf (&value[2 * i], "%02x", digest[i]);
-           value[32] = '\0';
            res = make_string (value, 32);
          }
        else
@@ -4728,16 +4727,15 @@
 
     case 1:                    /* SHA1 */
       {
-       unsigned char digest[20];
-       sha1_buffer (SDATA (object) + start_byte,
+       char digest[20];
+       sha1_buffer (SSDATA (object) + start_byte,
                     SBYTES (object) - (size_byte - end_byte),
                     digest);
-       if (NILP(binary))
+       if (NILP (binary))
          {
-           unsigned char value[41];
+           char value[41];
            for (i = 0; i < 20; i++)
              sprintf (&value[2 * i], "%02x", digest[i]);
-           value[40] = '\0';
            res = make_string (value, 40);
          }
        else

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2011-05-27 16:17:59 +0000
+++ b/src/xselect.c     2011-05-27 19:32:01 +0000
@@ -822,7 +822,6 @@
       /* Perform conversions.  This can signal.  */
       for (j = 0; j < nselections; j++)
        {
-         struct selection_data *cs = converted_selections + j;
          Lisp_Object subtarget = AREF (multprop, 2*j);
          Atom subproperty = symbol_to_x_atom (dpyinfo,
                                               AREF (multprop, 2*j+1));
@@ -1878,7 +1877,7 @@
 static struct frame *
 frame_for_x_selection (Lisp_Object object)
 {
-  Lisp_Object tail, frame;
+  Lisp_Object tail;
   struct frame *f;
 
   if (NILP (object))
@@ -2110,7 +2109,7 @@
    UTF8_STRING property, as described by
    http://www.freedesktop.org/wiki/ClipboardManager */
 
-void
+static void
 x_clipboard_manager_save (struct x_display_info *dpyinfo,
                          Lisp_Object frame)
 {
@@ -2157,7 +2156,7 @@
     {
       /* Loop through all X displays, saving owned clipboards.  */
       struct x_display_info *dpyinfo;
-      Lisp_Object local_selection, frame;
+      Lisp_Object local_selection, local_frame;
       for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next)
        {
          local_selection = LOCAL_SELECTION (QCLIPBOARD, dpyinfo);
@@ -2166,9 +2165,9 @@
                                      dpyinfo->Xatom_CLIPBOARD_MANAGER))
            continue;
 
-         frame = XCAR (XCDR (XCDR (XCDR (local_selection))));
-         if (FRAME_LIVE_P (XFRAME (frame)))
-           x_clipboard_manager_save (dpyinfo, frame);
+         local_frame = XCAR (XCDR (XCDR (XCDR (local_selection))));
+         if (FRAME_LIVE_P (XFRAME (local_frame)))
+           x_clipboard_manager_save (dpyinfo, local_frame);
        }
     }