This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.17-590-ga07c573


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  a07c5731d63d0db1659d273ee42d46ac15daeffc (commit)
      from  1324e37f2e36fb641b82ad7b353fa28d5d57e44b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a07c5731d63d0db1659d273ee42d46ac15daeffc

commit a07c5731d63d0db1659d273ee42d46ac15daeffc
Author: Ondrej Bilka <neleai@seznam.cz>
Date:   Wed May 1 20:55:06 2013 +0200

    Remove duplicate __strcmp_cg
    
    The __strcmp_cg code was duplicate of of __strcmp_gc. This patch unifies
    these two cases into one.

diff --git a/ChangeLog b/ChangeLog
index cd846f9..7df0492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-01  OndÅ?ej Bílka  <neleai@seznam.cz>
+
+	* string/bits/string2.h (__strcmp_cg): Call __strcmp_gc.
+
 2013-05-01  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/posix/opendir.c: Include <sys/param.h> to get MIN/MAX macros.
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 94f5ee9..ddd1c04 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -887,30 +887,7 @@ __stpcpy_small (char *__dest,
 		      }							      \
 		    __result; }))
 
-# define __strcmp_gc(s1, s2, l2) \
-  (__extension__ ({ const unsigned char *__s1 =				      \
-		      (const unsigned char *) (const char *) (s1);	      \
-		    register int __result =				      \
-		      __s1[0] - ((const unsigned char *)		      \
-				 (const char *) (s2))[0];		      \
-		    if (l2 > 0 && __result == 0)			      \
-		      {							      \
-			__result = (__s1[1]				      \
-				    - ((const unsigned char *)		      \
-				       (const char *) (s2))[1]);	      \
-			if (l2 > 1 && __result == 0)			      \
-			  {						      \
-			    __result =					      \
-			      (__s1[2] - ((const unsigned char *)	      \
-					  (const char *) (s2))[2]);	      \
-			    if (l2 > 2 && __result == 0)		      \
-			      __result =				      \
-				(__s1[3]				      \
-				 - ((const unsigned char *)		      \
-				    (const char *) (s2))[3]);		      \
-			  }						      \
-		      }							      \
-		    __result; }))
+# define __strcmp_gc(s1, s2, l2) (- __strcmp_cg (s2, s1, l2))
 #endif
 
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    4 ++++
 string/bits/string2.h |   25 +------------------------
 2 files changed, 5 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]