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

commit eda34aab951c490eb96a2d058552ee1764656cd0
Author: Emanuele Giaquinta 
Date:   Sat Dec 18 14:00:43 2010 +0000

    Simplify.

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

--- a/src/command.C
+++ b/src/command.C
@@ -2776,11 +2776,11 @@ enum {
   CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
 };

-#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0)			\
+#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7)			\
     (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4)	\
      | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
 #define get_byte_array_bit(array, bit)				\
-    (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
+    (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))

 static const unsigned char csi_defaults[] =
   {
diff --git a/src/init.C b/src/init.C

--- a/src/init.C
+++ b/src/init.C
@@ -892,7 +892,6 @@ rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 void
 rxvt_term::init_env ()
 {
-  int i;
   char *val;

 #ifdef DISPLAY_IS_IP
@@ -916,8 +915,7 @@ rxvt_term::init_env ()
   if (rs[Rs_display_name] == NULL)
     rs[Rs_display_name] = val;   /* use broken `:0' value */

-  i = strlen (val);
-  env_display = (char *)rxvt_malloc (i + 9);
+  env_display = (char *)rxvt_malloc (strlen (val) + 9);

   sprintf (env_display, "DISPLAY=%s", val);

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