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

commit e15f176d7d37c4b615fc9cbb9f8d3e6341b0c96f
Author: Emanuele Giaquinta 
Date:   Sat Sep 8 21:25:56 2007 +0000

    Saner function names.

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

--- 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

--- 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

--- 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;

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