Remove random_hex(). *sadface*

SammyK · SammyK · commit a1e62293b12f · 2015-02-20T15:10:42.000-06:00
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -1902,12 +1902,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_random_bytes, 0, 0, 0)
 	ZEND_ARG_INFO(0, bytes)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_random_hex, 0, 0, 0)
-	ZEND_ARG_INFO(0, bytes)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_random_int, 0, 0, 0)
-	ZEND_ARG_INFO(0, min)
 	ZEND_ARG_INFO(0, max)
 ZEND_END_ARG_INFO()
 /* }}} */
@@ -2835,7 +2830,6 @@ const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(mt_getrandmax,													arginfo_mt_getrandmax)
 
 	PHP_FE(random_bytes,													arginfo_random_bytes)
-	PHP_FE(random_hex,													arginfo_random_hex)
 	PHP_FE(random_int,													arginfo_random_int)
 
 #if HAVE_GETSERVBYNAME
diff --git a/ext/standard/php_random.h b/ext/standard/php_random.h
@@ -22,7 +22,6 @@
 #define PHP_RANDOM_H
 
 PHP_FUNCTION(random_bytes);
-PHP_FUNCTION(random_hex);
 PHP_FUNCTION(random_int);
 #endif
 
diff --git a/ext/standard/random.c b/ext/standard/random.c
@@ -35,26 +35,6 @@ union rand_long_buffer {
 	long number;
 };
 
-/*
-// Copy/pasted from string.c
-static char hexconvtab[] = "0123456789abcdef";
-
-// Copy/pasted from string.c
-static void php_bin_to_hex(zend_string *old, const zend_long old_len, zend_string *hex)
-{
-	zend_long i, j;
-
-	hex = zend_string_alloc(old_len * 2, 0); // @todo is this right?
-
-	for (i = j = 0; i < old_len; i++) {
-		hex->val[j++] = hexconvtab[old->val[i] >> 4];
-		hex->val[j++] = hexconvtab[old->val[i] & 15];
-	}
-
-	hex->val[j] = '\0';
-}
-*/
-
 // Copy/pasted from mcrypt.c
 static int php_random_bytes(char *bytes, zend_long size)
 {
@@ -127,39 +107,6 @@ PHP_FUNCTION(random_bytes)
 }
 /* }}} */
 
-/* {{{ proto string random_hex(int bytes)
-Return an arbitrary length of pseudo-random bytes as hexadecimal string */
-PHP_FUNCTION(random_hex)
-{
-	/*
-	zend_long size;
-	zend_string *bytes;
-	zend_string *hex;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &size) == FAILURE) {
-		return;
-	}
-
-	if (size <= 0 || size >= INT_MAX) {
-		php_error_docref(NULL, E_WARNING, "Cannot genrate a random string with a size of less than 1 or greater than %d", INT_MAX);
-		RETURN_FALSE;
-	}
-
-	if (php_random_bytes(bytes, size) == FAILURE) {
-		return;
-	}
-
-	int hex_size = size * 2;
-
-	php_bin_to_hex(bytes, hex_size, hex);
-
-	zend_string_release(bytes);
-	*/
-
-	RETURN_STR("Foo!");
-}
-/* }}} */
-
 /* {{{ proto int random_int(int maximum)
 Return an arbitrary pseudo-random integer */
 PHP_FUNCTION(random_int)
