From: Automatic source maintenance Date: Tue, 23 Mar 2010 00:13:27 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_2_0_1~335 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1c8a478844a850a87f4b48524a09f56141aea8c;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/compat/strsep.h b/compat/strsep.h index 87d1c71bc9..d951bd858e 100644 --- a/compat/strsep.h +++ b/compat/strsep.h @@ -41,17 +41,17 @@ * to point to the next char after it. Otherwise, *STRINGP is set to NULL. * If *STRINGP was already NULL, nothing happens. * Returns the old value of *STRINGP. - * + * *\par * This is a variant of strtok() that is multithread-safe and supports * empty fields. - * + * * \note Caveat: It modifies the original string. * \note Caveat: These functions cannot be used on constant strings. * \note Caveat: The identity of the delimiting character is lost. * \note Caveat: It doesn't work with multibyte strings unless all of the delimiter * characters are ASCII characters < 0x30. - * + * * See also strtok_r(). */ SQUIDCEXTERN char *strsep(char **stringp, const char *delim); diff --git a/compat/strtoll.h b/compat/strtoll.h index 60c04c21a0..7dd12b02ed 100644 --- a/compat/strtoll.h +++ b/compat/strtoll.h @@ -10,7 +10,7 @@ /** *\par * Convert a string to a int64 integer. - * + * *\par * Ignores `locale' stuff. Assumes that the upper and lower case * alphabets and digits are each contiguous. diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc index b48ebdc089..5f84ea41f8 100644 --- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc +++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc @@ -138,7 +138,7 @@ gethost_name(void) hres_list = hres_list->ai_next; } rc = getnameinfo(hres->ai_addr, hres->ai_addrlen, hostname, - sizeof(hostname), NULL, 0, 0); + sizeof(hostname), NULL, 0, 0); if (rc != 0) { fprintf(stderr, "%s| %s: ERROR: resolving ip address with getnameinfo: %s failed\n", diff --git a/lib/getnameinfo.c b/lib/getnameinfo.c index f94ea52e7e..bec315ba56 100644 --- a/lib/getnameinfo.c +++ b/lib/getnameinfo.c @@ -325,7 +325,7 @@ numeric: #endif default: if (inet_ntop(afd->a_af, addr, host, - hostlen) == NULL) + hostlen) == NULL) return EAI_SYSTEM; break; } diff --git a/test-suite/pconn-banger.c b/test-suite/pconn-banger.c index 7ca24bcd47..93345dbc64 100644 --- a/test-suite/pconn-banger.c +++ b/test-suite/pconn-banger.c @@ -142,9 +142,8 @@ open_http_socket(void) if ((s = socket(AI->ai_family, AI->ai_socktype, AI->ai_protocol)) < 0) { perror("socket"); - s = -1; - } - else if (connect(s, AI->ai_addr, AI->ai_addrlen) < 0) { + s = -1; + } else if (connect(s, AI->ai_addr, AI->ai_addrlen) < 0) { close(s); perror("connect"); s = -1;