- Convert 'PHP3' to 'PHP'

- Avoid declaring crypt() related salt types twice

7 files changed, 76 insertions, 72 deletions

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index a7ba604ff3..1da0f17d8d 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -24,10 +24,11 @@ main() {
   ])
   ])
   if test "$ac_cv_crypt_des" = "yes"; then
-    AC_DEFINE(PHP3_STD_DES_CRYPT, 1, [ ])
+    ac_result=1
   else
-    AC_DEFINE(PHP3_STD_DES_CRYPT, 0, [ ])
+    ac_result=0
   fi
+  AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports standard DES salt])
 
   AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
   AC_TRY_RUN([
@@ -46,10 +47,11 @@ main() {
   ])
   ])
   if test "$ac_cv_crypt_ext_des" = "yes"; then
-    AC_DEFINE(PHP3_EXT_DES_CRYPT,1, [ ])
+    ac_result=1
   else
-    AC_DEFINE(PHP3_EXT_DES_CRYPT,0, [ ])
+    ac_result=0
   fi
+  AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system supports extended DES salt])
 
   AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[
   AC_TRY_RUN([
@@ -77,10 +79,11 @@ main() {
   ])
   ])
   if test "$ac_cv_crypt_md5" = "yes"; then
-    AC_DEFINE(PHP3_MD5_CRYPT,1,[ ])
+    ac_result=1
   else
-    AC_DEFINE(PHP3_MD5_CRYPT,0,[ ])
+    ac_result=0
   fi
+  AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, $ac_result, [Whether the system supports MD5 salt])
 
   AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[
   AC_TRY_RUN([
@@ -105,10 +108,11 @@ main() {
   ])
   ])
   if test "$ac_cv_crypt_blowfish" = "yes"; then
-    AC_DEFINE(PHP3_BLOWFISH_CRYPT,1,[ ])
+    ac_result=1
   else
-    AC_DEFINE(PHP3_BLOWFISH_CRYPT,0,[ ])
+    ac_result=0
   fi
+  AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, $ac_result, [Whether the system supports BlowFish salt])
 ])
 
 AC_CHECK_LIB(c, dlopen, [
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 1eeb6818df..1d5c1bd5c3 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -60,49 +60,49 @@ zend_module_entry crypt_module_entry = {
 
 /* 
    The capabilities of the crypt() function is determined by the test programs
-   run by configure from aclocal.m4.  They will set PHP3_STD_DES_CRYPT,
-   PHP3_EXT_DES_CRYPT, PHP3_MD5_CRYPT and PHP3_BLOWFISH_CRYPT as appropriate 
+   run by configure from aclocal.m4.  They will set PHP_STD_DES_CRYPT,
+   PHP_EXT_DES_CRYPT, PHP_MD5_CRYPT and PHP_BLOWFISH_CRYPT as appropriate 
    for the target platform
 */
-#if PHP3_STD_DES_CRYPT
-#define PHP3_MAX_SALT_LEN 2
+#if PHP_STD_DES_CRYPT
+#define PHP_MAX_SALT_LEN 2
 #endif
-#if PHP3_EXT_DES_CRYPT
-#undef PHP3_MAX_SALT_LEN
-#define PHP3_MAX_SALT_LEN 9
+#if PHP_EXT_DES_CRYPT
+#undef PHP_MAX_SALT_LEN
+#define PHP_MAX_SALT_LEN 9
 #endif
-#if PHP3_MD5_CRYPT
-#undef PHP3_MAX_SALT_LEN
-#define PHP3_MAX_SALT_LEN 12
+#if PHP_MD5_CRYPT
+#undef PHP_MAX_SALT_LEN
+#define PHP_MAX_SALT_LEN 12
 #endif
-#if PHP3_BLOWFISH_CRYPT
-#undef PHP3_MAX_SALT_LEN
-#define PHP3_MAX_SALT_LEN 17
+#if PHP_BLOWFISH_CRYPT
+#undef PHP_MAX_SALT_LEN
+#define PHP_MAX_SALT_LEN 17
 #endif
 
 #if HAVE_LRAND48
-#define PHP3_CRYPT_RAND lrand48()
+#define PHP_CRYPT_RAND lrand48()
 #else
 #if HAVE_RANDOM
-#define PHP3_CRYPT_RAND random()
+#define PHP_CRYPT_RAND random()
 #else
-#define PHP3_CRYPT_RAND rand()
+#define PHP_CRYPT_RAND rand()
 #endif
 #endif
 
 PHP_MINIT_FUNCTION(crypt)
 {
-#if PHP3_STD_DES_CRYPT
+#if PHP_STD_DES_CRYPT
     REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT);
 #else
-#if PHP3_MD5_CRYPT
+#if PHP_MD5_CRYPT
     REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 12, CONST_CS | CONST_PERSISTENT);
 #endif
 #endif
-    REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP3_STD_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
-    REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP3_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
-    REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP3_MD5_CRYPT, CONST_CS | CONST_PERSISTENT);
-    REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP3_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT);
     return SUCCESS;
 }
 
@@ -117,13 +117,13 @@ static void php_to64(char *s, long v, int n)	{
 
 PHP_FUNCTION(crypt)
 {
-	char salt[PHP3_MAX_SALT_LEN+1];
+	char salt[PHP_MAX_SALT_LEN+1];
 	pval **arg1, **arg2;
 
-	salt[0]=salt[PHP3_MAX_SALT_LEN]='\0';
+	salt[0]=salt[PHP_MAX_SALT_LEN]='\0';
 	/* This will produce suitable results if people depend on DES-encryption
 	   available (passing always 2-character salt). At least for glibc6.1 */
-	memset(&salt[1], '$', PHP3_MAX_SALT_LEN-1);
+	memset(&salt[1], '$', PHP_MAX_SALT_LEN-1);
 
 	switch (ARG_COUNT(ht)) {
 		case 1:
@@ -136,7 +136,7 @@ PHP_FUNCTION(crypt)
 				RETURN_FALSE;
 			}
 			convert_to_string_ex(arg2);
-			memcpy(salt, (*arg2)->value.str.val, MIN(PHP3_MAX_SALT_LEN,(*arg2)->value.str.len));
+			memcpy(salt, (*arg2)->value.str.val, MIN(PHP_MAX_SALT_LEN,(*arg2)->value.str.len));
 			break;
 		default:
 			WRONG_PARAM_COUNT;
@@ -156,14 +156,14 @@ PHP_FUNCTION(crypt)
 #endif
 #endif
 
-#if PHP3_STD_DES_CRYPT
-		php_to64(&salt[0], PHP3_CRYPT_RAND, 2);
+#if PHP_STD_DES_CRYPT
+		php_to64(&salt[0], PHP_CRYPT_RAND, 2);
 		salt[2] = '\0';
 #else
-#if PHP3_MD5_CRYPT
+#if PHP_MD5_CRYPT
 		strcpy(salt, "$1$");
-		php_to64(&salt[3], PHP3_CRYPT_RAND, 4);
-		php_to64(&salt[7], PHP3_CRYPT_RAND, 4);
+		php_to64(&salt[3], PHP_CRYPT_RAND, 4);
+		php_to64(&salt[7], PHP_CRYPT_RAND, 4);
 		strcpy(&salt[11], "$");
 #endif
 #endif
diff --git a/ext/standard/head.h b/ext/standard/head.h
index 10d1a53603..db7b383e8e 100644
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -32,7 +32,7 @@
 
 /* 
    We are still using a PHP2-style Push/Pop list here as opposed
-   to the PHP3 built-in list functionality because of the nature
+   to the PHP built-in list functionality because of the nature
    of this particular list.  It is just used as a structured
    buffer.  Doing this with the built-in list code would require
    some changes to allow a search for the first item with a
diff --git a/ext/standard/info.c b/ext/standard/info.c
index bba5693d49..f6d25ce3d4 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -29,7 +29,7 @@
 #include "zend_globals.h"		/* needs ELS */
 
 
-#define PHP3_CONF_LONG(directive,value1,value2) \
+#define PHP_CONF_LONG(directive,value1,value2) \
 	php_printf("<tr><td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\">%s</td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">%ld</td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">%ld</td></tr>\n",directive,value1,value2);
 
 #define SECTION(name)  PUTS("<hr><h2>" name "</h2>\n")
diff --git a/ext/standard/md5.c b/ext/standard/md5.c
index bb9237baa5..2993d71e74 100644
--- a/ext/standard/md5.c
+++ b/ext/standard/md5.c
@@ -31,7 +31,7 @@ PHP_NAMED_FUNCTION(php_if_md5)
 {
 	pval **arg;
 	char md5str[33];
-	PHP3_MD5_CTX context;
+	PHP_MD5_CTX context;
 	unsigned char digest[16];
 	int i;
 	char *r;
@@ -42,9 +42,9 @@ PHP_NAMED_FUNCTION(php_if_md5)
 	convert_to_string_ex(arg);
 
 	md5str[0] = '\0';
-	PHP3_MD5Init(&context);
-	PHP3_MD5Update(&context, (*arg)->value.str.val, (*arg)->value.str.len);
-	PHP3_MD5Final(digest, &context);
+	PHP_MD5Init(&context);
+	PHP_MD5Update(&context, (*arg)->value.str.val, (*arg)->value.str.len);
+	PHP_MD5Final(digest, &context);
 	for (i = 0, r = md5str; i < 16; i++, r += 2) {
 		sprintf(r, "%02x", digest[i]);
 	}
@@ -154,7 +154,7 @@ static unsigned char PADDING[64] =
 
 /* MD5 initialization. Begins an MD5 operation, writing a new context.
  */
-void PHP3_MD5Init(PHP3_MD5_CTX * context)
+void PHP_MD5Init(PHP_MD5_CTX * context)
 {
 	context->count[0] = context->count[1] = 0;
 	/* Load magic initialization constants.
@@ -169,7 +169,7 @@ void PHP3_MD5Init(PHP3_MD5_CTX * context)
    operation, processing another message block, and updating the
    context.
  */
-void PHP3_MD5Update(PHP3_MD5_CTX * context, const unsigned char *input,
+void PHP_MD5Update(PHP_MD5_CTX * context, const unsigned char *input,
 			   unsigned int inputLen)
 {
 	unsigned int i, index, partLen;
@@ -208,7 +208,7 @@ void PHP3_MD5Update(PHP3_MD5_CTX * context, const unsigned char *input,
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
    the message digest and zeroizing the context.
  */
-void PHP3_MD5Final(unsigned char digest[16], PHP3_MD5_CTX * context)
+void PHP_MD5Final(unsigned char digest[16], PHP_MD5_CTX * context)
 {
 	unsigned char bits[8];
 	unsigned int index, padLen;
@@ -220,10 +220,10 @@ void PHP3_MD5Final(unsigned char digest[16], PHP3_MD5_CTX * context)
 	 */
 	index = (unsigned int) ((context->count[0] >> 3) & 0x3f);
 	padLen = (index < 56) ? (56 - index) : (120 - index);
-	PHP3_MD5Update(context, PADDING, padLen);
+	PHP_MD5Update(context, PADDING, padLen);
 
 	/* Append length (before padding) */
-	PHP3_MD5Update(context, bits, 8);
+	PHP_MD5Update(context, bits, 8);
 
 	/* Store state in digest */
 	Encode(digest, context->state, 16);
diff --git a/ext/standard/md5.h b/ext/standard/md5.h
index f754590748..b29b0ef14e 100644
--- a/ext/standard/md5.h
+++ b/ext/standard/md5.h
@@ -60,11 +60,11 @@ typedef struct {
 	UINT4 state[4];				/* state (ABCD) */
 	UINT4 count[2];				/* number of bits, modulo 2^64 (lsb first) */
 	unsigned char buffer[64];	/* input buffer */
-} PHP3_MD5_CTX;
+} PHP_MD5_CTX;
 
-void PHP3_MD5Init PROTO_LIST((PHP3_MD5_CTX *));
-void PHP3_MD5Update PROTO_LIST((PHP3_MD5_CTX *, const unsigned char *, unsigned int));
-void PHP3_MD5Final PROTO_LIST((unsigned char[16], PHP3_MD5_CTX *));
+void PHP_MD5Init PROTO_LIST((PHP_MD5_CTX *));
+void PHP_MD5Update PROTO_LIST((PHP_MD5_CTX *, const unsigned char *, unsigned int));
+void PHP_MD5Final PROTO_LIST((unsigned char[16], PHP_MD5_CTX *));
 
 PHP_NAMED_FUNCTION(php_if_md5);
 
diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index 7c910676c9..e0746d8e3d 100644
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -113,27 +113,27 @@ PHP_FUNCTION(getrusage)
 	}
 
 	array_init(return_value);
-#define PHP3_RUSAGE_PARA(a) \
+#define PHP_RUSAGE_PARA(a) \
 		add_assoc_long(return_value, #a, usg.a)
 #ifndef _OSD_POSIX /* BS2000 has only a few fields in the rusage struct */
-	PHP3_RUSAGE_PARA(ru_oublock);
-	PHP3_RUSAGE_PARA(ru_inblock);
-	PHP3_RUSAGE_PARA(ru_msgsnd);
-	PHP3_RUSAGE_PARA(ru_msgrcv);
-	PHP3_RUSAGE_PARA(ru_maxrss);
-	PHP3_RUSAGE_PARA(ru_ixrss);
-	PHP3_RUSAGE_PARA(ru_idrss);
-	PHP3_RUSAGE_PARA(ru_minflt);
-	PHP3_RUSAGE_PARA(ru_majflt);
-	PHP3_RUSAGE_PARA(ru_nsignals);
-	PHP3_RUSAGE_PARA(ru_nvcsw);
-	PHP3_RUSAGE_PARA(ru_nivcsw);
+	PHP_RUSAGE_PARA(ru_oublock);
+	PHP_RUSAGE_PARA(ru_inblock);
+	PHP_RUSAGE_PARA(ru_msgsnd);
+	PHP_RUSAGE_PARA(ru_msgrcv);
+	PHP_RUSAGE_PARA(ru_maxrss);
+	PHP_RUSAGE_PARA(ru_ixrss);
+	PHP_RUSAGE_PARA(ru_idrss);
+	PHP_RUSAGE_PARA(ru_minflt);
+	PHP_RUSAGE_PARA(ru_majflt);
+	PHP_RUSAGE_PARA(ru_nsignals);
+	PHP_RUSAGE_PARA(ru_nvcsw);
+	PHP_RUSAGE_PARA(ru_nivcsw);
 #endif /*_OSD_POSIX*/
-	PHP3_RUSAGE_PARA(ru_utime.tv_usec);
-	PHP3_RUSAGE_PARA(ru_utime.tv_sec);
-	PHP3_RUSAGE_PARA(ru_stime.tv_usec);
-	PHP3_RUSAGE_PARA(ru_stime.tv_sec);
-#undef PHP3_RUSAGE_PARA
+	PHP_RUSAGE_PARA(ru_utime.tv_usec);
+	PHP_RUSAGE_PARA(ru_utime.tv_sec);
+	PHP_RUSAGE_PARA(ru_stime.tv_usec);
+	PHP_RUSAGE_PARA(ru_stime.tv_sec);
+#undef PHP_RUSAGE_PARA
 }
 #endif /* HAVE_GETRUSAGE */