X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bed6327e0962c95394b530b7b1ebc40e2af28320..69181512bd1798ed632ab8c201afc3a7901b05e7:/sbr/utils.c diff --git a/sbr/utils.c b/sbr/utils.c index fff1aacd..b7580252 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -46,9 +46,7 @@ void *mh_xrealloc(void *ptr, size_t size) /* Copy POSIX behaviour, coping with non-POSIX systems. */ if (size == 0) { - if (ptr) { - free(ptr); - } + mh_xfree(ptr); return mh_xmalloc(1); /* Get a unique pointer. */ } if (!ptr) @@ -381,6 +379,26 @@ void TrimSuffixC(char *s, int c) } +/* ToLower runs all of s through tolower(3). */ +void ToLower(char *s) +{ + unsigned char *b; + + for (b = (unsigned char *)s; (*b = tolower(*b)); b++) + ; +} + + +/* ToUpper runs all of s through toupper(3). */ +void ToUpper(char *s) +{ + unsigned char *b; + + for (b = (unsigned char *)s; (*b = toupper(*b)); b++) + ; +} + + int nmh_init(const char *argv0, int read_context) { int status = OK; @@ -481,15 +499,14 @@ nmh_version_changed (int older) { } return old_version < current_version ? 1 : 0; - } else { - if (context_version == NULL || strcmp(context_version, "nmh-" VERSION) != 0) { - context_replace ("Version", "nmh-" VERSION); + } - return 1; - } else { - return 0; - } + if (context_version == NULL || strcmp(context_version, "nmh-" VERSION) != 0) { + context_replace ("Version", "nmh-" VERSION); + return 1; } + + return 0; } @@ -498,9 +515,8 @@ nmh_version_changed (int older) { char * upcase (const char *str) { char *up = cpytrim (str); - char *cp; - for (cp = up; *cp; ++cp) { *cp = toupper ((unsigned char) *cp); } + ToUpper(up); return up; }