This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-458-gf7bb179
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 May 2014 14:57:01 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-458-gf7bb179
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 f7bb179f77d131e2fc1bf0bc17f9e5748eaf058e (commit)
via 019324d0b792c5f031bd3f155baa2b730481b89a (commit)
via 34fff5c2473e970f4a58761c81ebbe097eaf211f (commit)
from 3d2badacf185fac740a2992240a817fb2ca325af (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=f7bb179f77d131e2fc1bf0bc17f9e5748eaf058e
commit f7bb179f77d131e2fc1bf0bc17f9e5748eaf058e
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Thu May 22 20:27:32 2014 +0530
Fix date in ChangeLog
diff --git a/ChangeLog b/ChangeLog
index ac8ed80..9525f09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@
* sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c
[libc_hidden_builtin_def]: Define hidden definition to __memchr_ppc32.
-2014-05-16 Roland McGrath <roland@hack.frob.com>
+2014-05-21 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/aarch64/arch-fork.h: New file.
* sysdeps/unix/sysv/linux/aarch64/nptl/fork.c: File removed.
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=019324d0b792c5f031bd3f155baa2b730481b89a
commit 019324d0b792c5f031bd3f155baa2b730481b89a
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Thu May 22 11:38:50 2014 +0530
Fix formatting
diff --git a/ChangeLog b/ChangeLog
index 771f3c5..ac8ed80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-22 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * crypt/md5-crypt.c: Fix formatting.
+
2014-05-22 Kostya Serebryany <konstantin.s.serebryany@gmail.com>
* crypt/md5-crypt.c (__md5_crypt_r): Remove a nested function.
diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c
index 5d5fc55..f6739d3 100644
--- a/crypt/md5-crypt.c
+++ b/crypt/md5-crypt.c
@@ -35,7 +35,7 @@ typedef int PRBool;
# define md5_init_ctx(ctxp, nss_ctxp) \
do \
{ \
- if (((nss_ctxp = NSSLOWHASH_NewContext (nss_ictx, HASH_AlgMD5)) \
+ if (((nss_ctxp = NSSLOWHASH_NewContext (nss_ictx, HASH_AlgMD5)) \
== NULL)) \
{ \
if (nss_ctx != NULL) \
@@ -90,8 +90,8 @@ extern char *__md5_crypt (const char *key, const char *salt);
static void
b64_from_24bit (char **cp, int *buflen,
- unsigned int b2, unsigned int b1, unsigned int b0,
- int n)
+ unsigned int b2, unsigned int b1, unsigned int b0,
+ int n)
{
unsigned int w = (b2 << 16) | (b1 << 8) | b0;
while (n-- > 0 && *buflen > 0)
@@ -283,17 +283,17 @@ __md5_crypt_r (key, salt, buffer, buflen)
}
b64_from_24bit (&cp, &buflen,
- alt_result[0], alt_result[6], alt_result[12], 4);
+ alt_result[0], alt_result[6], alt_result[12], 4);
b64_from_24bit (&cp, &buflen,
- alt_result[1], alt_result[7], alt_result[13], 4);
+ alt_result[1], alt_result[7], alt_result[13], 4);
b64_from_24bit (&cp, &buflen,
- alt_result[2], alt_result[8], alt_result[14], 4);
+ alt_result[2], alt_result[8], alt_result[14], 4);
b64_from_24bit (&cp, &buflen,
- alt_result[3], alt_result[9], alt_result[15], 4);
+ alt_result[3], alt_result[9], alt_result[15], 4);
b64_from_24bit (&cp, &buflen,
- alt_result[4], alt_result[10], alt_result[5], 4);
+ alt_result[4], alt_result[10], alt_result[5], 4);
b64_from_24bit (&cp, &buflen,
- 0, 0, alt_result[11], 2);
+ 0, 0, alt_result[11], 2);
if (buflen <= 0)
{
__set_errno (ERANGE);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=34fff5c2473e970f4a58761c81ebbe097eaf211f
commit 34fff5c2473e970f4a58761c81ebbe097eaf211f
Author: Konstantin Serebryany <konstantin.s.serebryany@gmail.com>
Date: Thu May 22 08:29:00 2014 +0530
Remove nested functions: crypt/md5-crypt.c
This patch is the first in the series of patches that remove nested
functions from glibc.
Rationale: nested functions is a non-standard language feature;
removing nested functions
will allow to compile glibc with compilers other than GCC and thus
benefit from other compilers
and code analysis tools.
diff --git a/ChangeLog b/ChangeLog
index 77fed0c..771f3c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-22 Kostya Serebryany <konstantin.s.serebryany@gmail.com>
+
+ * crypt/md5-crypt.c (__md5_crypt_r): Remove a nested function.
+ (b64_from_24bit): New function.
+
2014-05-22 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c (memchr): Remove
diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c
index d1b92d7..5d5fc55 100644
--- a/crypt/md5-crypt.c
+++ b/crypt/md5-crypt.c
@@ -88,6 +88,20 @@ extern char *__md5_crypt_r (const char *key, const char *salt,
char *buffer, int buflen);
extern char *__md5_crypt (const char *key, const char *salt);
+static void
+b64_from_24bit (char **cp, int *buflen,
+ unsigned int b2, unsigned int b1, unsigned int b0,
+ int n)
+{
+ unsigned int w = (b2 << 16) | (b1 << 8) | b0;
+ while (n-- > 0 && *buflen > 0)
+ {
+ *(*cp)++ = b64t[w & 0x3f];
+ --*buflen;
+ w >>= 6;
+ }
+}
+
/* This entry point is equivalent to the `crypt' function in Unix
libcs. */
@@ -268,24 +282,18 @@ __md5_crypt_r (key, salt, buffer, buflen)
--buflen;
}
- void b64_from_24bit (unsigned int b2, unsigned int b1, unsigned int b0,
- int n)
- {
- unsigned int w = (b2 << 16) | (b1 << 8) | b0;
- while (n-- > 0 && buflen > 0)
- {
- *cp++ = b64t[w & 0x3f];
- --buflen;
- w >>= 6;
- }
- }
-
- b64_from_24bit (alt_result[0], alt_result[6], alt_result[12], 4);
- b64_from_24bit (alt_result[1], alt_result[7], alt_result[13], 4);
- b64_from_24bit (alt_result[2], alt_result[8], alt_result[14], 4);
- b64_from_24bit (alt_result[3], alt_result[9], alt_result[15], 4);
- b64_from_24bit (alt_result[4], alt_result[10], alt_result[5], 4);
- b64_from_24bit (0, 0, alt_result[11], 2);
+ b64_from_24bit (&cp, &buflen,
+ alt_result[0], alt_result[6], alt_result[12], 4);
+ b64_from_24bit (&cp, &buflen,
+ alt_result[1], alt_result[7], alt_result[13], 4);
+ b64_from_24bit (&cp, &buflen,
+ alt_result[2], alt_result[8], alt_result[14], 4);
+ b64_from_24bit (&cp, &buflen,
+ alt_result[3], alt_result[9], alt_result[15], 4);
+ b64_from_24bit (&cp, &buflen,
+ alt_result[4], alt_result[10], alt_result[5], 4);
+ b64_from_24bit (&cp, &buflen,
+ 0, 0, alt_result[11], 2);
if (buflen <= 0)
{
__set_errno (ERANGE);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 ++++++++++-
crypt/md5-crypt.c | 46 +++++++++++++++++++++++++++-------------------
2 files changed, 37 insertions(+), 20 deletions(-)
hooks/post-receive
--
GNU C Library master sources