From: Sara Golemon Date: Mon, 25 Sep 2006 01:33:57 +0000 (+0000) Subject: Flag a couple more unicode ready functions X-Git-Tag: RELEASE_1_0_0RC1~1557 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8f5020a923c46753650d79dd52afe7b38e88502;p=php Flag a couple more unicode ready functions --- diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c index 484a2786c6..5d6a7192b2 100644 --- a/ext/standard/crc32.c +++ b/ext/standard/crc32.c @@ -22,7 +22,7 @@ #include "basic_functions.h" #include "crc32.h" -/* {{{ proto string crc32(string str) +/* {{{ proto string crc32(string str) U Calculate the crc32 polynomial of a string */ PHP_NAMED_FUNCTION(php_if_crc32) { @@ -31,7 +31,7 @@ PHP_NAMED_FUNCTION(php_if_crc32) php_uint32 crcinit = 0; register php_uint32 crc; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &p, &nr) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &p, &nr) == FAILURE) { return; } crc = crcinit^0xFFFFFFFF; diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index b147f88b0f..7d1eea0b76 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -111,8 +111,8 @@ static void php_to64(char *s, long v, int n) } } -/* {{{ proto string crypt(string str [, string salt]) - Encrypt a string */ +/* {{{ proto string crypt(string str [, string salt]) U + Hash a string */ PHP_FUNCTION(crypt) { char salt[PHP_MAX_SALT_LEN+1]; @@ -124,7 +124,7 @@ PHP_FUNCTION(crypt) available (passing always 2-character salt). At least for glibc6.1 */ memset(&salt[1], '$', PHP_MAX_SALT_LEN-1); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &str, &str_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|S", &str, &str_len, &salt_in, &salt_in_len) == FAILURE) { return; }