repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 7a6f4ebca9ff9539f3b46c67ef44259dc925ef33:
path_to: 
revision_to: 

commit 7a6f4ebca9ff9539f3b46c67ef44259dc925ef33
Author: Marc Lehmann 
Date:   Mon Nov 28 19:35:04 2005 +0000

    *** empty log message ***

diff --git a/src/keyboard.C b/src/keyboard.C

--- a/src/keyboard.C
+++ b/src/keyboard.C
@@ -117,7 +117,7 @@ format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsi
 ////////////////////////////////////////////////////////////////////////////////
 // return: #bits of '1'
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
-# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); }))
+# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); }))
 #else
 static int
 bitcount (uint16_t n)
diff --git a/src/main.C b/src/main.C

--- a/src/main.C
+++ b/src/main.C
@@ -849,7 +849,7 @@ rxvt_term::tt_winch ()

 /*----------------------------------------------------------------------*/
 /* set_fonts () - load and set the various fonts
-/*
+ *
  * init = 1   - initialize
  *
  * fontname == FONT_UP  - switch to bigger font
@@ -1553,7 +1553,7 @@ foundpet:
 void
 rxvt_term::im_cb ()
 {
-  int i, found, had_im;
+  int i;
   const char *p;
   char **s;
   char buf[IMBUFSIZ];
diff --git a/src/rxvtc.C b/src/rxvtc.C

--- a/src/rxvtc.C
+++ b/src/rxvtc.C
@@ -86,8 +86,8 @@ main (int argc, const char *const *argv)

   c.send ("CWD"), c.send (cwd);

-  for (char **var = environ; *environ; environ++)
-    c.send ("ENV"), c.send (*environ);
+  for (char **var = environ; *var; var++)
+    c.send ("ENV"), c.send (*var);

   const char *base = strrchr (argv[0], '/');
   base = base ? base + 1 : argv[0];
diff --git a/src/rxvtfont.C b/src/rxvtfont.C

--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -1314,7 +1314,7 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
 /////////////////////////////////////////////////////////////////////////////

 rxvt_fontset::rxvt_fontset (rxvt_t r)
-: r (r), fontdesc (0)
+: fontdesc (0), r (r)
 {
   clear ();
 }
diff --git a/src/rxvtfont.h b/src/rxvtfont.h

--- a/src/rxvtfont.h
+++ b/src/rxvtfont.h
@@ -40,11 +40,11 @@ struct rxvt_fontprop {

 struct rxvt_drawable {
   rxvt_display *display;
-  Drawable drawable;
 #if XFT
   XftDraw *xftdrawable;
   operator XftDraw *();
 #endif
+  Drawable drawable;

   rxvt_drawable (rxvt_display *display, Drawable drawable)
   : display(display),
diff --git a/src/rxvtutil.h b/src/rxvtutil.h

--- a/src/rxvtutil.h
+++ b/src/rxvtutil.h
@@ -15,9 +15,9 @@ public:
 } byteorder;

 template
-static inline T min (T a, U b) { return a < b ? a : (T)b; }
+static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
 template
-static inline T max (T a, U b) { return a > b ? a : (T)b; }
+static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
 template
 static inline void swap (T& a, T& b) { T t=a; a=b; b=t; }

diff --git a/src/screen.C b/src/screen.C

--- a/src/screen.C
+++ b/src/screen.C
@@ -443,7 +443,6 @@ void
 rxvt_term::scr_release ()
 {
   unsigned int total_rows;
-  int i;

   total_rows = TermWin.nrow + TermWin.saveLines;

@@ -780,7 +779,7 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)

   unsigned char checksel;
   unicode_t c;
-  int i, row, last_col;
+  int row, last_col;
   text_t *stp;
   rend_t *srp;
   const unicode_t *strend = str + len;
@@ -2163,9 +2162,6 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
   scr_swap_overlay ();
 #endif

-  rend_t *drp, *srp;  /* drawn-rend-pointer, screen-rend-pointer   */
-  text_t *dtp, *stp;  /* drawn-text-pointer, screen-text-pointer   */
-
 #ifndef NO_SLOW_LINK_SUPPORT
   /*
    * D: CopyArea pass - very useful for slower links
diff --git a/src/xdefaults.C b/src/xdefaults.C

--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -909,7 +909,6 @@ rxvt_term::extract_resources ()
   int entry;

 #  ifdef XrmEnumOneLevel
-  int i;
   char *displayResource, *xe;
   XrmName name_prefix[3];
   XrmClass class_prefix[3];

-----END OF PAGE-----