From: root <root>
Date: Sun, 26 Apr 2009 01:59:53 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=edfd10e0a0d3131728fd82466eefea1f829a33b1;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/background.C b/src/background.C
index 753360e6..a7df1279 100644
--- a/src/background.C
+++ b/src/background.C
@@ -261,7 +261,7 @@ bgPixmap_t::set_geometry (const char *geom)
   unsigned int w = 0, h = 0;
   unsigned int n;
   unsigned long new_flags = (flags & (~geometryFlags));
-  char *p;
+  const char *p;
 #  define MAXLEN_GEOM		256 /* could be longer than regular geometry string */
 
   if (geom == NULL)
@@ -677,10 +677,10 @@ bgPixmap_t::set_file (const char *file)
       if (!target->asimman)
         target->asimman = create_generic_imageman (target->rs[Rs_path]);
 
-      if (char *f = strchr (file, ';'))
+      if (const char *p = strchr (file, ';'))
         {
-          size_t len = f - file;
-          f = (char *)malloc (len + 1);
+          size_t len = p - file;
+          char *f = (char *)malloc (len + 1);
           memcpy (f, file, len);
           f[len] = '\0';
           original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
diff --git a/src/init.C b/src/init.C
index 33247f2b..18b70b90 100644
--- a/src/init.C
+++ b/src/init.C
@@ -1603,7 +1603,7 @@ rxvt_term::run_child (const char *const *argv)
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
 
-      argv0 = (const char *)rxvt_basename (shell);
+      argv0 = rxvt_basename (shell);
 
       if (option (Opt_loginShell))
         {
diff --git a/src/misc.C b/src/misc.C
index c55c5433..2fa28a94 100644
--- a/src/misc.C
+++ b/src/misc.C
@@ -167,7 +167,7 @@ rxvt_utf8towcs (const char *str, int len)
   return r;
 }
 
-char *
+const char *
 rxvt_basename (const char *str) NOTHROW
 {
   char *base = strrchr (str, '/');
diff --git a/src/rxvt.h b/src/rxvt.h
index c59b7270..e369e6f2 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -153,7 +153,7 @@ wchar_t *        rxvt_mbstowcs                    (const char *str, int len = -1
 char *           rxvt_wcstoutf8                   (const wchar_t *str, int len = -1);
 wchar_t *        rxvt_utf8towcs                   (const char *str, int len = -1);
 
-char *           rxvt_basename                    (const char *str) NOTHROW;
+const char *     rxvt_basename                    (const char *str) NOTHROW;
 void             rxvt_vlog                        (const char *fmt, va_list arg_ptr) NOTHROW;
 void             rxvt_log                         (const char *fmt,...) NOTHROW;
 void             rxvt_warn                        (const char *fmt,...) NOTHROW;