--- rxvt-unicode/src/background.C	2010/07/26 09:57:53	1.39
+++ rxvt-unicode/src/background.C	2010/08/29 13:40:42	1.43
@@ -29,17 +29,21 @@
 #if DO_TIMING_TEST
 # include <sys/time.h>
 #define TIMING_TEST_START(id) \
-  struct timeval timing_test_##id##_stv;\
+  struct timeval timing_test_##id##_stv; \
   gettimeofday (&timing_test_##id##_stv, NULL);
 
 #define TIMING_TEST_PRINT_RESULT(id) \
-  do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\
-      fprintf (stderr, "%s: %s: %d: elapsed  %ld usec\n", #id, __FILE__, __LINE__,\
-               tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)
+  do { \
+    struct timeval tv; \
+    gettimeofday (&tv, NULL); \
+    tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
+    fprintf (stderr, "%s: %s: %d: elapsed  %ld usec\n", #id, __FILE__, __LINE__, \
+             tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
+  } while (0)
 
 #else
-#define TIMING_TEST_START(id) do{}while (0)
-#define TIMING_TEST_PRINT_RESULT(id) do{}while (0)
+#define TIMING_TEST_START(id) do {} while (0)
+#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
 #endif
 
 /*
@@ -48,7 +52,7 @@
  * adjustment and may optionally be followed by a colon and one or more
  * colon-delimited pixmap operations.
  * The following table shows the valid geometry strings and their
- * affects on the background image :
+ * effects on the background image :
  *
  * WxH+X+Y  	Set scaling to W% by H%, and position to X% by Y%.
  *            W and H are percentages of the terminal window size.
@@ -552,7 +556,6 @@
         {
           /* if blending background and image - pixmap has to be sized same as target window */
           ASImageLayer *layers = create_image_layers (2);
-          ASImage *merged_im = NULL;
 
           layers[0].im = background;
           layers[0].clip_width = target_width;
@@ -680,11 +683,10 @@
       if (const char *p = strchr (file, ';'))
         {
           size_t len = p - file;
-          char *f = (char *)malloc (len + 1);
+          char *f = rxvt_temp_buf<char> (len + 1);
           memcpy (f, file, len);
           f[len] = '\0';
           original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
-          free (f);
         }
       else
         original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);