cvs: php-src /ext/standard crc32.c crypt.c

pollita Mon Sep 25 01:33:57 2006 UTC Modified files: /php-src/ext/standard crc32.c crypt.c Log: Flag a couple more unicode ready functions http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crc32.c?r1=1.19&r2=1.20&diff_format=u Index: php-src/ext/standard/crc32.c diff -u php-src/ext/standard/crc32.c:1.19 php-src/ext/standard/crc32.c:1.20 --- php-src/ext/standard/crc32.c:1.19 Thu Feb 9 15:48:18 2006 +++ php-src/ext/standard/crc32.c Mon Sep 25 01:33:57 2006 @@ -16,13 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: crc32.c,v 1.19 2006/02/09 15:48:18 pajoye Exp $ */ +/* $Id: crc32.c,v 1.20 2006/09/25 01:33:57 pollita Exp $ */ #include "php.h" #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_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; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.63&r2=1.64&diff_format=u Index: php-src/ext/standard/crypt.c diff -u php-src/ext/standard/crypt.c:1.63 php-src/ext/standard/crypt.c:1.64 --- php-src/ext/standard/crypt.c:1.63 Sun Jan 1 13:09:55 2006 +++ php-src/ext/standard/crypt.c Mon Sep 25 01:33:57 2006 @@ -17,7 +17,7 @@ | Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.63 2006/01/01 13:09:55 sniper Exp $ */ +/* $Id: crypt.c,v 1.64 2006/09/25 01:33:57 pollita Exp $ */ #include <stdlib.h> #include "php.h" @@ -111,8 +111,8 @@ } } -/* {{{ 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 @@ 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; }