Replace `(char *)0' et al with `NULL'.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 02e8cfb325af4c2955f47004f6819af5e9d8779b..7306170952591eefc98f2ea019919d999930db1f 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -103,7 +103,7 @@ void mh_xfree(void *ptr)
 char *
 pwd(void)
 {
 char *
 pwd(void)
 {

-    register char *cp;
+    char *cp;

     static char curwd[PATH_MAX];
 
     if (!getcwd (curwd, PATH_MAX)) {
     static char curwd[PATH_MAX];
 
     if (!getcwd (curwd, PATH_MAX)) {


@@ -360,6 +360,27 @@ nmh_strcasestr (const char *s1, const char *s2) {
 }
 
 
 }
 
 

+/* EndsWithC returns true if non-NULL string s ends with a c before the
+ * terminating NUL. */
+bool EndsWithC(char *s, int c)
+{
+    return *s && s[strlen(s) - 1] == c;
+}
+
+
+/* TrimSuffixC deletes c from the end of non-NULL string s if it's
+ * present, shortening s by 1.  Only one instance of c is removed. */
+void TrimSuffixC(char *s, int c)
+{
+    if (!*s)
+        return;
+
+    s += strlen(s) - 1;
+    if (*s == c)
+        *s = '\0';
+}
+
+

 int
 nmh_init(const char *argv0, int read_context) {
     if (! setlocale(LC_ALL, "")) {
 int
 nmh_init(const char *argv0, int read_context) {
     if (! setlocale(LC_ALL, "")) {