*** empty log message ***

diff --git a/src/background.C b/src/background.C
index 753360e62a9eaa1e24c4eba35476ae3bbfd8f0e5..a7df12794feb32b8be0c9afc0eddc8e578793167 100644 (file)
--- 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 33247f2badad33cef98ca82346a2705f750a9408..18b70b90ee684b7fd3ddb17106f9a2985e1cbf11 100644 (file)
--- 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 c55c54332a7d0ce2ff99f1bb4d38d35194a343a5..2fa28a94848036904a9964d49bdf67e96a19ebb5 100644 (file)
--- 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 c59b72707ba6a3a60ea05b1f7650b40493b5422c..e369e6f24cce700936b60bf29d0326f5d8f3cd9d 100644 (file)
--- 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;