emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103744: nt/*.c, src/*.c: Remove unus


From: Juanma Barranquero
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103744: nt/*.c, src/*.c: Remove unused variables.
Date: Fri, 25 Mar 2011 16:39:59 +0100
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 103744
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2011-03-25 16:39:59 +0100
message:
  nt/*.c, src/*.c: Remove unused variables.
  
  * nt/addpm.c (main): Remove unused variable `retval'.
  * nt/preprep.c (main): Remove unused variable `ptr'.
  * src/dispextern.h (glyph_matric): Use #if GLYPH_DEBUG, not #ifdef.
  * src/fileio.c (check_executable) [DOS_NT]: Remove unused variables `len'
    and `suffix'.
    (Fset_file_selinux_context) [HAVE_LIBSELINUX]: Move here declaration
    of variables specific to SELinux and computation of `encoded_absname'.
  * src/image.c (XPutPixel): Remove unused variable `height'.
  * src/keyboard.c (make_lispy_event): Remove unused variable `hpos'.
  * src/unexw32.c (get_section_info): Remove unused variable `section'.
  * src/w32.c (stat): Remove unused variables `drive_root' and `devtype'.
    (system_process_attributes): Remove unused variable `sess'.
    (sys_read): Remove unused variable `err'.
  * src/w32fns.c (top): Wrap variables with #if GLYPH_DEBUG, not #ifdef.
    (w32_wnd_proc): Remove unused variable `isdead'.
    (unwind_create_frame): Use #if GLYPH_DEBUG, not #ifdef.
    (Fx_server_max_request_size): Remove unused variable `dpyinfo'.
    (x_create_tip_frame): Remove unused variable `tem'.
  * src/w32inevt.c (w32_console_read_socket): Remove unused variable 
`no_events'.
  * src/w32term.c (x_draw_composite_glyph_string_foreground):
    Remove unused variable `width'.
modified:
  nt/ChangeLog
  nt/addpm.c
  nt/preprep.c
  src/ChangeLog
  src/dispextern.h
  src/fileio.c
  src/image.c
  src/keyboard.c
  src/unexw32.c
  src/w32.c
  src/w32fns.c
  src/w32inevt.c
  src/w32term.c
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2011-03-23 16:25:38 +0000
+++ b/nt/ChangeLog      2011-03-25 15:39:59 +0000
@@ -1,3 +1,9 @@
+2011-03-25  Juanma Barranquero  <address@hidden>
+
+       * addpm.c (main): Remove unused variable `retval'.
+
+       * preprep.c (main): Remove unused variable `ptr'.
+
 2011-03-23  Juanma Barranquero  <address@hidden>
 
        * cmdproxy.c: Include <ctype.h>.

=== modified file 'nt/addpm.c'
--- a/nt/addpm.c        2011-01-25 04:08:28 +0000
+++ b/nt/addpm.c        2011-03-25 15:39:59 +0000
@@ -274,8 +274,6 @@
     {
       if (strlen (start_folder) < (MAX_PATH - 20))
        {
-         BOOL retval;
-
          strcat (start_folder, "\\Gnu Emacs");
          if (CreateDirectory (start_folder, NULL)
              || GetLastError () == ERROR_ALREADY_EXISTS)
@@ -307,8 +305,6 @@
       /* Ensure there is enough room for "...\GNU Emacs\Emacs.lnk".  */
       if (strlen (start_folder) < (MAX_PATH - 20))
        {
-         BOOL retval;
-
          strcat (start_folder, "\\Gnu Emacs");
          if (CreateDirectory (start_folder, NULL)
              || GetLastError () == ERROR_ALREADY_EXISTS)

=== modified file 'nt/preprep.c'
--- a/nt/preprep.c      2011-01-25 04:08:28 +0000
+++ b/nt/preprep.c      2011-03-25 15:39:59 +0000
@@ -765,7 +765,6 @@
   PIMAGE_NT_HEADERS nt_header;
   file_data in_file, out_file;
   char out_filename[MAX_PATH], in_filename[MAX_PATH];
-  const char *ptr;
 
   strcpy (in_filename, argv[1]);
   strcpy (out_filename, argv[2]);

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-24 02:30:26 +0000
+++ b/src/ChangeLog     2011-03-25 15:39:59 +0000
@@ -1,3 +1,34 @@
+2011-03-25  Juanma Barranquero  <address@hidden>
+
+       * dispextern.h (glyph_matric): Use #if GLYPH_DEBUG, not #ifdef.
+
+       * fileio.c (check_executable) [DOS_NT]: Remove unused variables `len'
+       and `suffix'.
+       (Fset_file_selinux_context) [HAVE_LIBSELINUX]: Move here declaration
+       of variables specific to SELinux and computation of `encoded_absname'.
+
+       * image.c (XPutPixel): Remove unused variable `height'.
+
+       * keyboard.c (make_lispy_event): Remove unused variable `hpos'.
+
+       * unexw32.c (get_section_info): Remove unused variable `section'.
+
+       * w32.c (stat): Remove unused variables `drive_root' and `devtype'.
+       (system_process_attributes): Remove unused variable `sess'.
+       (sys_read): Remove unused variable `err'.
+
+       * w32fns.c (top): Wrap variables with #if GLYPH_DEBUG, not #ifdef.
+       (w32_wnd_proc): Remove unused variable `isdead'.
+       (unwind_create_frame): Use #if GLYPH_DEBUG, not #ifdef.
+       (Fx_server_max_request_size): Remove unused variable `dpyinfo'.
+       (x_create_tip_frame): Remove unused variable `tem'.
+
+       * w32inevt.c (w32_console_read_socket):
+       Remove unused variable `no_events'.
+
+       * w32term.c (x_draw_composite_glyph_string_foreground):
+       Remove unused variable `width'.
+
 2011-03-24  Juanma Barranquero  <address@hidden>
 
        * w32term.c (x_set_glyph_string_clipping):
@@ -40,7 +71,7 @@
        * buffer.c (Fkill_all_local_variables):
        * keyboard.c (Fcommand_execute, Fsuspend_emacs, safe_run_hooks_1):
        Use Frun_hooks.
-       (command_loop_1): Use Frun_hooks. Call safe_run_hooks
+       (command_loop_1): Use Frun_hooks.  Call safe_run_hooks
        unconditionnaly since it does the check itself.
 
 2011-03-23  Paul Eggert  <address@hidden>

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2011-03-09 02:12:00 +0000
+++ b/src/dispextern.h  2011-03-25 15:39:59 +0000
@@ -662,7 +662,7 @@
      line.  */
   unsigned header_line_p : 1;
 
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
   /* A string identifying the method used to display the matrix.  */
   char method[512];
 #endif

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2011-03-23 10:06:57 +0000
+++ b/src/fileio.c      2011-03-25 15:39:59 +0000
@@ -2359,8 +2359,6 @@
 check_executable (char *filename)
 {
 #ifdef DOS_NT
-  int len = strlen (filename);
-  char *suffix;
   struct stat st;
   if (stat (filename, &st) < 0)
     return 0;
@@ -2786,13 +2784,14 @@
 is disabled. */)
   (Lisp_Object filename, Lisp_Object context)
 {
-  Lisp_Object absname, encoded_absname;
+  Lisp_Object absname;
   Lisp_Object handler;
+#if HAVE_LIBSELINUX
+  Lisp_Object encoded_absname;
   Lisp_Object user = CAR_SAFE (context);
   Lisp_Object role = CAR_SAFE (CDR_SAFE (context));
   Lisp_Object type = CAR_SAFE (CDR_SAFE (CDR_SAFE (context)));
   Lisp_Object range = CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (context))));
-#if HAVE_LIBSELINUX
   security_context_t con;
   int fail, conlength;
   context_t parsed_con;
@@ -2806,9 +2805,9 @@
   if (!NILP (handler))
     return call3 (handler, Qset_file_selinux_context, absname, context);
 
+#if HAVE_LIBSELINUX
   encoded_absname = ENCODE_FILE (absname);
 
-#if HAVE_LIBSELINUX
   if (is_selinux_enabled ())
     {
       /* Get current file context. */

=== modified file 'src/image.c'
--- a/src/image.c       2011-03-13 08:04:44 +0000
+++ b/src/image.c       2011-03-25 15:39:59 +0000
@@ -4485,7 +4485,6 @@
 XPutPixel (XImagePtr ximg, int x, int y, COLORREF color)
 {
   int width = ximg->info.bmiHeader.biWidth;
-  int height = ximg->info.bmiHeader.biHeight;
   unsigned char * pixel;
 
   /* True color images.  */

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2011-03-23 10:06:57 +0000
+++ b/src/keyboard.c    2011-03-25 15:39:59 +0000
@@ -5399,7 +5399,6 @@
                && (event->modifiers & down_modifier))
              {
                Lisp_Object items, item;
-               int hpos;
                int i;
 
                /* Find the menu bar item under `column'.  */

=== modified file 'src/unexw32.c'
--- a/src/unexw32.c     2011-03-17 18:41:30 +0000
+++ b/src/unexw32.c     2011-03-25 15:39:59 +0000
@@ -341,7 +341,6 @@
 {
   PIMAGE_DOS_HEADER dos_header;
   PIMAGE_NT_HEADERS nt_header;
-  PIMAGE_SECTION_HEADER section;
   int overlap;
 
   dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base;

=== modified file 'src/w32.c'
--- a/src/w32.c 2011-03-14 17:07:53 +0000
+++ b/src/w32.c 2011-03-25 15:39:59 +0000
@@ -3250,8 +3250,6 @@
 stat (const char * path, struct stat * buf)
 {
   char *name, *r;
-  char drive_root[4];
-  UINT devtype;
   WIN32_FIND_DATA wfd;
   HANDLE fh;
   unsigned __int64 fake_inode;
@@ -4043,7 +4041,6 @@
   TOKEN_PRIMARY_GROUP group_token;
   unsigned euid;
   unsigned egid;
-  DWORD sess;
   PROCESS_MEMORY_COUNTERS mem;
   PROCESS_MEMORY_COUNTERS_EX mem_ex;
   DWORD minrss, maxrss;
@@ -5408,7 +5405,6 @@
            {
              HANDLE hnd = fd_info[fd].hnd;
              OVERLAPPED *ovl = &fd_info[fd].cp->ovl_read;
-             DWORD err = 0;
              int rc = 0;
              COMMTIMEOUTS ct;
 

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2011-03-23 16:25:38 +0000
+++ b/src/w32fns.c      2011-03-25 15:39:59 +0000
@@ -183,7 +183,7 @@
 #define MENU_FREE_DELAY 1000
 static unsigned menu_free_timer = 0;
 
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
 int image_cache_refcount, dpyinfo_refcount;
 #endif
 
@@ -2862,7 +2862,6 @@
                         base character (ie. translating the base key plus
                         shift modifier).  */
                      int add;
-                     int isdead = 0;
                      KEY_EVENT_RECORD key;
 
                      key.bKeyDown = TRUE;
@@ -3980,7 +3979,7 @@
   /* If frame is ``official'', nothing to do.  */
   if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
     {
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
       struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
 #endif
 
@@ -4521,8 +4520,6 @@
 If omitted or nil, that stands for the selected frame's display.  */)
   (Lisp_Object display)
 {
-  struct w32_display_info *dpyinfo = check_x_display_info (display);
-
   return make_number (1);
 }
 
@@ -5171,7 +5168,7 @@
                    Lisp_Object parms, Lisp_Object text)
 {
   struct frame *f;
-  Lisp_Object frame, tem;
+  Lisp_Object frame;
   Lisp_Object name;
   long window_prompting = 0;
   int width, height;

=== modified file 'src/w32inevt.c'
--- a/src/w32inevt.c    2011-03-14 17:07:53 +0000
+++ b/src/w32inevt.c    2011-03-25 15:39:59 +0000
@@ -677,7 +677,6 @@
                          int expected,
                          struct input_event *hold_quit)
 {
-  BOOL no_events = TRUE;
   int nev, ret = 0, add;
   int isdead;
 

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2011-03-24 02:30:26 +0000
+++ b/src/w32term.c     2011-03-25 15:39:59 +0000
@@ -1289,7 +1289,6 @@
   else if (! s->first_glyph->u.cmp.automatic)
     {
       int y = s->ybase;
-      int width = 0;
       HFONT old_font;
 
       old_font = SelectObject (s->hdc, FONT_HANDLE (font));


reply via email to

[Prev in Thread] Current Thread [Next in Thread]