Minor clean up to silence some gcc warnings.

* src/window.c (Fset_window_buffer):
* src/xterm.c (x_set_frame_alpha): Restructure code to silence
compiler warning.
(handle_one_xevent): Remove unused var `p'.
(do_ewmh_fullscreen): Remove unused var `lval'.
(xembed_set_info): Remove unused var `atom'.
* src/textprop.c (Fremove_list_of_text_properties): Add braces to silence
compiler warning.
* src/fontset.c (fontset_id_valid_p, dump_fontset):
* src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration.
* src/eval.c (Feval, Ffuncall): Avoid unneeded gotos.
* src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause'
label only when it's used.
* src/image.c (x_create_bitmap_from_xpm_data):
* src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like
its callers.
* src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and
`consumed_chars'.
(DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'.
(decode_coding_emacs_mule): Remove unused label `retry'.
(detect_eol): Add parens to silence compiler warning.
* src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where
it's used to silence the compiler.
(make_number): Modernize k&r declaration.
(mark_char_table): Add parens to silence compiler warning.

1 files changed, 36 insertions, 40 deletions

diff --git a/src/coding.c b/src/coding.c
index a7b7c7d6b23..e409ffdadf1 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1607,10 +1607,9 @@ static int
 detect_coding_utf_16 (struct coding_system *coding,
                       struct coding_detection_info *detect_info)
 {
-  const unsigned char *src = coding->source, *src_base = src;
+  const unsigned char *src = coding->source;
   const unsigned char *src_end = coding->source + coding->src_bytes;
   int multibytep = coding->src_multibyte;
-  int consumed_chars = 0;
   int c1, c2;
 
   detect_info->checked |= CATEGORY_MASK_UTF_16;
@@ -2277,7 +2276,6 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
 #define DECODE_EMACS_MULE_21_COMPOSITION()                              \
   do {                                                                  \
     enum composition_method method = c - 0xF2;                          \
-    int *charbuf_base = charbuf;                                        \
     int nbytes, nchars;                                                 \
                                                                         \
     ONE_MORE_BYTE (c);                                                  \
@@ -2633,7 +2631,6 @@ decode_coding_emacs_mule (struct coding_system *coding)
         }
       continue;
 
-    retry:
       src = src_base;
       consumed_chars = consumed_chars_base;
       continue;
@@ -6260,8 +6257,9 @@ detect_eol (const unsigned char *source, EMACS_INT src_bytes,
                 {
                   /* The found type is different from what found before.
                      Allow for stray ^M characters in DOS EOL files.  */
-                  if (eol_seen == EOL_SEEN_CR && this_eol == EOL_SEEN_CRLF
-                      || eol_seen == EOL_SEEN_CRLF && this_eol == EOL_SEEN_CR)
+                  if ((eol_seen == EOL_SEEN_CR && this_eol == EOL_SEEN_CRLF)
+                      || (eol_seen == EOL_SEEN_CRLF
+                          && this_eol == EOL_SEEN_CR))
                     eol_seen = EOL_SEEN_CRLF;
                   else
                     {
@@ -6276,42 +6274,40 @@ detect_eol (const unsigned char *source, EMACS_INT src_bytes,
         }
     }
   else
-    {
-      while (src < src_end)
-        {
-          c = *src++;
-          if (c == '\n' || c == '\r')
-            {
-              int this_eol;
+    while (src < src_end)
+      {
+        c = *src++;
+        if (c == '\n' || c == '\r')
+          {
+            int this_eol;
 
-              if (c == '\n')
-                this_eol = EOL_SEEN_LF;
-              else if (src >= src_end || *src != '\n')
-                this_eol = EOL_SEEN_CR;
-              else
-                this_eol = EOL_SEEN_CRLF, src++;
+            if (c == '\n')
+              this_eol = EOL_SEEN_LF;
+            else if (src >= src_end || *src != '\n')
+              this_eol = EOL_SEEN_CR;
+            else
+              this_eol = EOL_SEEN_CRLF, src++;
 
-              if (eol_seen == EOL_SEEN_NONE)
-                /* This is the first end-of-line.  */
-                eol_seen = this_eol;
-              else if (eol_seen != this_eol)
-                {
-                  /* The found type is different from what found before.
-                     Allow for stray ^M characters in DOS EOL files.  */
-                  if (eol_seen == EOL_SEEN_CR && this_eol == EOL_SEEN_CRLF
-                      || eol_seen == EOL_SEEN_CRLF && this_eol == EOL_SEEN_CR)
-                    eol_seen = EOL_SEEN_CRLF;
-                  else
-                    {
-                      eol_seen = EOL_SEEN_LF;
-                      break;
-                    }
-                }
-              if (++total == MAX_EOL_CHECK_COUNT)
-                break;
-            }
-        }
-    }
+            if (eol_seen == EOL_SEEN_NONE)
+              /* This is the first end-of-line.  */
+              eol_seen = this_eol;
+            else if (eol_seen != this_eol)
+              {
+                /* The found type is different from what found before.
+                   Allow for stray ^M characters in DOS EOL files.  */
+                if ((eol_seen == EOL_SEEN_CR && this_eol == EOL_SEEN_CRLF)
+                    || (eol_seen == EOL_SEEN_CRLF && this_eol == EOL_SEEN_CR))
+                  eol_seen = EOL_SEEN_CRLF;
+                else
+                  {
+                    eol_seen = EOL_SEEN_LF;
+                    break;
+                  }
+              }
+            if (++total == MAX_EOL_CHECK_COUNT)
+              break;
+          }
+      }
   return eol_seen;
 }