svn commit: r227812 - head/lib/libc/string

[Eitan Adler]

Author: eadler (ports committer)
Date: Tue Nov 22 02:50:24 2011
New Revision: 227812
URL: http://svn.freebsd.org/changeset/base/227812

Log:
  - fix some style(9) nits with my last commit
  - add a comment explaining why I used '|' instead of '||'
  
  Submitted by:	danfe@
  Approved by:	emaste@

Modified:
  head/lib/libc/string/strcasecmp.c
  head/lib/libc/string/strncmp.c

Modified: head/lib/libc/string/strcasecmp.c
==============================================================================
--- head/lib/libc/string/strcasecmp.c	Tue Nov 22 02:27:59 2011	(r227811)
+++ head/lib/libc/string/strcasecmp.c	Tue Nov 22 02:50:24 2011	(r227812)
@@ -49,7 +49,7 @@ strcasecmp_l(const char *s1, const char 
 			*us1 = (const u_char *)s1,
 			*us2 = (const u_char *)s2;
 	if (s1 == s2)
-	    return (0);
+		return (0);
 
 	FIX_LOCALE(locale);
 
@@ -73,8 +73,9 @@ strncasecmp_l(const char *s1, const char
 			*us1 = (const u_char *)s1,
 			*us2 = (const u_char *)s2;
 	
-	if (( s1 == s2) | (n == 0))
-	    return (0);
+	/* use a bitwise or to avoid an additional branch instruction */
+	if ((s1 == s2) | (n == 0))
+		return (0);
 
 
 	do {

Modified: head/lib/libc/string/strncmp.c
==============================================================================
--- head/lib/libc/string/strncmp.c	Tue Nov 22 02:27:59 2011	(r227811)
+++ head/lib/libc/string/strncmp.c	Tue Nov 22 02:50:24 2011	(r227812)
@@ -39,6 +39,7 @@ int
 strncmp(const char *s1, const char *s2, size_t n)
 {
 
+	/* use a bitwise or to avoid an additional branch instruction */
 	if ((n == 0) | (s1 == s2))
 		return (0);