Saner function names.

diff --git a/src/init.C b/src/init.C
index 316282e4fda13a2cfea2c7ddb9920a0c91c2bd8f..460ec138ad047c06036731da7ee51076c3c2ec16 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -296,7 +296,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
       cmd_argv[i] = NULL;
     }
 
-  rs[Rs_name] = rxvt_r_basename (argv[0]);
+  rs[Rs_name] = rxvt_basename (argv[0]);
 
   /*
    * Open display, get options/resources and create the window
@@ -349,7 +349,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
   if (cmd_argv && cmd_argv[0])
     {
       if (!rs[Rs_title])
-        rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
+        rs[Rs_title] = rxvt_basename (cmd_argv[0]);
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_title];
     }
@@ -1388,7 +1388,7 @@ rxvt_term::run_child (const char *const *argv)
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
 
-      argv0 = (const char *)rxvt_r_basename (shell);
+      argv0 = (const char *)rxvt_basename (shell);
 
       if (option (Opt_loginShell))
         {

diff --git a/src/misc.C b/src/misc.C
index f65cde4aee52aecae6a104ba104cecd0e9706470..8aa16b7413d2fd2fb8b9c6db8dd92d8aae8f25d5 100644 (file)
--- a/src/misc.C
+++ b/src/misc.C
@@ -165,7 +165,7 @@ rxvt_utf8towcs (const char *str, int len)
 }
 
 char *
-rxvt_r_basename (const char *str) NOTHROW
+rxvt_basename (const char *str) NOTHROW
 {
   char *base = strrchr (str, '/');
 
@@ -238,7 +238,7 @@ rxvt_exit_failure () THROW ((class rxvt_failure_exception))
  * remove leading/trailing space in place.
  */
 char           *
-rxvt_Str_trim (char *str) NOTHROW
+rxvt_strtrim (char *str) NOTHROW
 {
   char *r, *s;
 
@@ -290,7 +290,7 @@ rxvt_splitcommastring (const char *cs) NOTHROW
       ret[l] = (char *)malloc (p + 1);
       strncpy (ret[l], s, p);
       ret[l][p] = '\0';
-      rxvt_Str_trim (ret[l]);
+      rxvt_strtrim (ret[l]);
       s = ++t;
     }
 

diff --git a/src/rxvt.h b/src/rxvt.h
index 31a98298c03588adcc29e45409301a8a54f508ca..e8f5e818f88101810569119886231a5a40f52af9 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -113,14 +113,14 @@ wchar_t *        rxvt_utf8towcs                   (const char *str, int len = -1
 
 #define rxvt_strdup(s) ((s) ? strdup(s) : 0)
 
-char *           rxvt_r_basename                  (const char *str) NOTHROW;
+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;
 void             rxvt_fatal                       (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
 void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception)) NORETURN;
 
-char           * rxvt_Str_trim                    (char *str) NOTHROW;
+char           * rxvt_strtrim                     (char *str) NOTHROW;
 char          ** rxvt_splitcommastring            (const char *cs) NOTHROW;
 void             rxvt_freecommastring             (char **cs) NOTHROW;