BUG/MINOR: Correct logic in cut_crlf()

This corrects what appears to be logic errors in cut_crlf().
I assume that the intention of this function is to truncate a
string at the first cr or lf. However, currently lf are ignored.

Also use '\0' instead of 0 as the null character, a cosmetic change.

Cc: Krzysztof Piotr Oledzki <ole@ans.pl>
Signed-off-by: Simon Horman <horms@verge.net.au>
[WT: this fix may be backported to 1.4 too]

diff --git a/include/common/standard.h b/include/common/standard.h
index b1db8213bd6aea553eee23e9974be8da2bb25d8d..6946ded371ababe96d281337cba27a7341b16007 100644 (file)
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -411,14 +411,14 @@ unsigned int inetaddr_host_lim_ret(char *text, char *stop, char **ret);
 
 static inline char *cut_crlf(char *s) {
 
-       while (*s != '\r' || *s == '\n') {
+       while (*s != '\r' && *s != '\n') {
                char *p = s++;
 
                if (!*p)
                        return p;
        }
 
-       *s++ = 0;
+       *s++ = '\0';
 
        return s;
 }