pajoye Wed, 09 Dec 2009 00:32:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291900
Log:
- drop non used code and fix warning
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c
U php/php-src/trunk/ext/standard/crypt_sha512.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c 2009-12-09
00:20:14 UTC (rev 291899)
+++ php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c 2009-12-09
00:32:14 UTC (rev 291900)
@@ -39,25 +39,14 @@
# include <strings.h>
# endif
#endif
-#if 0
-#ifndef stpncpy
-char * stpncpy(char *dst, const char *src, size_t len)
-{
- size_t n = strlen(src);
- if (n > len) {
- n = len;
- }
- return strncpy(dst, src, len) + n;
-}
+
+#ifndef HAVE_MEMPCPY
+extern void * mempcpy(void * dst, const void * src, size_t len);
#endif
-#ifndef mempcpy
-void * mempcpy(void * dst, const void * src, size_t len)
-{
- return (((char *)memcpy(dst, src, len)) + len);
-}
+#ifndef HAVE_STRPNCPY
+extern char * stpncpy(char *dst, const char *src, size_t len);
#endif
-#endif
#ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
Modified: php/php-src/trunk/ext/standard/crypt_sha512.c
===================================================================
--- php/php-src/trunk/ext/standard/crypt_sha512.c 2009-12-09 00:20:14 UTC
(rev 291899)
+++ php/php-src/trunk/ext/standard/crypt_sha512.c 2009-12-09 00:32:14 UTC
(rev 291900)
@@ -39,25 +39,14 @@
# include <strings.h>
# endif
#endif
-#if 0
-#ifndef stpncpy
-char * stpncpy(char *dst, const char *src, size_t len)
-{
- size_t n = strlen(src);
- if (n > len) {
- n = len;
- }
- return strncpy(dst, src, len) + n;
-}
+
+#ifndef HAVE_MEMPCPY
+extern void * mempcpy(void * dst, const void * src, size_t len);
#endif
-#ifndef mempcpy
-void * mempcpy(void * dst, const void * src, size_t len)
-{
- return (((char *)memcpy(dst, src, len)) + len);
-}
+#ifndef HAVE_STRPNCPY
+extern char * stpncpy(char *dst, const char *src, size_t len);
#endif
-#endif
#ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
