from:"Michael Maclean"

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ basic_functions.c

2010-10-04 Thread Michael Maclean

mgdm Mon, 04 Oct 2010 20:20:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=304035

Log:
Un-deprecate mt_rand and deprecate mt_getrandmax

Changed paths:
U   php/php-src/trunk/ext/standard/basic_functions.c

Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2010-10-04 19:48:57 UTC 
(rev 304034)
+++ php/php-src/trunk/ext/standard/basic_functions.c2010-10-04 20:20:30 UTC 
(rev 304035)
@@ -2830,9 +2830,9 @@
PHP_FE(rand,
arginfo_rand)
PHP_FE(srand,   
arginfo_srand)
PHP_DEP_FE(getrandmax,  
arginfo_getrandmax)
-   PHP_DEP_FE(mt_rand, 
arginfo_mt_rand)
+   PHP_FE(mt_rand, 
arginfo_mt_rand)
PHP_FE(mt_srand,
arginfo_mt_srand)
-   PHP_FE(mt_getrandmax,   
arginfo_mt_getrandmax)
+   PHP_DEP_FE(mt_getrandmax,   
arginfo_mt_getrandmax)

 #if HAVE_GETSERVBYNAME
PHP_FE(getservbyname,   
arginfo_getservbyname)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/soap/ php_encoding.c php_encoding.h

2010-03-25 Thread Michael Maclean

mgdm Thu, 25 Mar 2010 14:43:15 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296787

Log:
Remove some calls to TSRMLS_FETCH in ext/soap

Changed paths:
U   php/php-src/trunk/ext/soap/php_encoding.c
U   php/php-src/trunk/ext/soap/php_encoding.h

Modified: php/php-src/trunk/ext/soap/php_encoding.c
===
--- php/php-src/trunk/ext/soap/php_encoding.c	2010-03-25 14:34:13 UTC (rev 296786)
+++ php/php-src/trunk/ext/soap/php_encoding.c	2010-03-25 14:43:15 UTC (rev 296787)
@@ -29,60 +29,60 @@
 #include zend_interfaces.h

 /* zval type decode */
-static zval *to_zval_double(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_long(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_bool(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_string(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_stringr(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_stringc(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_map(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_null(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_base64(encodeTypePtr type, xmlNodePtr data);
-static zval *to_zval_hexbin(encodeTypePtr type, xmlNodePtr data);
+static zval *to_zval_double(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_long(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_bool(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_string(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_stringr(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_stringc(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_map(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_null(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_base64(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+static zval *to_zval_hexbin(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);

-static xmlNodePtr to_xml_long(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_double(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_bool(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
+static xmlNodePtr to_xml_long(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);
+static xmlNodePtr to_xml_double(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);
+static xmlNodePtr to_xml_bool(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);

 /* String encode */
-static xmlNodePtr to_xml_string(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_base64(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_hexbin(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
+static xmlNodePtr to_xml_string(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);
+static xmlNodePtr to_xml_base64(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);
+static xmlNodePtr to_xml_hexbin(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);

 /* Null encode */
-static xmlNodePtr to_xml_null(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
+static xmlNodePtr to_xml_null(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);

 /* Array encode */
-static xmlNodePtr guess_array_map(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
+static xmlNodePtr guess_array_map(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);
+static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);

-static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_list1(encodeTypePtr enc, zval *data, int style, xmlNodePtr parent);
+static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodePtr parent TSRMLS_DC);
+static xmlNodePtr to_xml_list1(encodeTypePtr enc, zval *data, int style, xmlNodePtr parent TSRMLS_DC);

 /* Datetime encode/decode */
-static xmlNodePtr to_xml_datetime_ex(encodeTypePtr type, zval *data, char *format, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_datetime(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_time(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_date(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_gyearmonth(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static xmlNodePtr to_xml_gyear(encodeTypePtr type, zval *data, int style, xmlNodePtr parent);
-static

[PHP-CVS] svn: /php/php-src/trunk/ext/soap/ php_encoding.c php_encoding.h php_packet_soap.c soap.c

2010-03-25 Thread Michael Maclean

mgdm Thu, 25 Mar 2010 20:06:05 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296820

Log:
Remove some more calls to TSRMLS_FETCH()

Changed paths:
U   php/php-src/trunk/ext/soap/php_encoding.c
U   php/php-src/trunk/ext/soap/php_encoding.h
U   php/php-src/trunk/ext/soap/php_packet_soap.c
U   php/php-src/trunk/ext/soap/soap.c

Modified: php/php-src/trunk/ext/soap/php_encoding.c
===
--- php/php-src/trunk/ext/soap/php_encoding.c	2010-03-25 20:03:00 UTC (rev 296819)
+++ php/php-src/trunk/ext/soap/php_encoding.c	2010-03-25 20:06:05 UTC (rev 296820)
@@ -358,11 +358,10 @@
 	return 0;
 }

-static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style, xmlNodePtr parent, int check_class_map)
+static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style, xmlNodePtr parent, int check_class_map TSRMLS_DC)
 {
 	xmlNodePtr node = NULL;
 	int add_type = 0;
-	TSRMLS_FETCH();

 	/* Special handling of class SoapVar */
 	if (data 
@@ -407,9 +406,9 @@
 		}

 		if (zend_hash_find(ht, enc_value, sizeof(enc_value), (void **)zdata) == FAILURE) {
-			node = master_to_xml(enc, NULL, style, parent);
+			node = master_to_xml(enc, NULL, style, parent TSRMLS_CC);
 		} else {
-			node = master_to_xml(enc, *zdata, style, parent);
+			node = master_to_xml(enc, *zdata, style, parent TSRMLS_CC);
 		}

 		if (style == SOAP_ENCODED || (SOAP_GLOBAL(sdl)  encode != enc)) {
@@ -495,15 +494,14 @@
 	return node;
 }

-xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr parent)
+xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr parent TSRMLS_DC)
 {
-	return master_to_xml_int(encode, data, style, parent, 1);
+	return master_to_xml_int(encode, data, style, parent, 1 TSRMLS_CC);
 }

-static zval *master_to_zval_int(encodePtr encode, xmlNodePtr data)
+static zval *master_to_zval_int(encodePtr encode, xmlNodePtr data TSRMLS_DC)
 {
 	zval *ret = NULL;
-	TSRMLS_FETCH();

 	if (SOAP_GLOBAL(typemap)) {
 		if (encode-details.type_str) {
@@ -552,9 +550,8 @@
 	return ret;
 }

-zval *master_to_zval(encodePtr encode, xmlNodePtr data)
+zval *master_to_zval(encodePtr encode, xmlNodePtr data TSRMLS_DC)
 {
-	TSRMLS_FETCH();
 	data = check_and_resolve_href(data);

 	if (encode == NULL) {
@@ -584,7 +581,7 @@
 			}
 		}
 	}
-	return master_to_zval_int(encode, data);
+	return master_to_zval_int(encode, data TSRMLS_CC);
 }

 xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC)
@@ -1264,7 +1261,7 @@

 	while (node != NULL) {
 		if (get_zval_property(ret, (char*)node-name TSRMLS_CC) == NULL) {
-			zval* val = master_to_zval(get_conversion(XSD_ANYXML), node);
+			zval* val = master_to_zval(get_conversion(XSD_ANYXML), node TSRMLS_CC);

 			if (any  Z_TYPE_P(any) != IS_ARRAY) {
 /* Convert into array */
@@ -1283,7 +1280,7 @@
 			if (Z_TYPE_P(val) == IS_STRING  *Z_STRVAL_P(val) == '') {
 name = NULL;
 while (node-next != NULL) {
-	zval* val2 = master_to_zval(get_conversion(XSD_ANYXML), node-next);
+	zval* val2 = master_to_zval(get_conversion(XSD_ANYXML), node-next TSRMLS_CC);
 	if (Z_TYPE_P(val2) != IS_STRING ||  *Z_STRVAL_P(val) != '') {
 		break;
 	}
@@ -1355,19 +1352,19 @@
 		if (model-u.element-fixed  strcmp(model-u.element-fixed, (char*)r_node-children-content) != 0) {
 			soap_error3(E_ERROR, Encoding: Element '%s' has fixed value '%s' (value '%s' is not allowed), model-u.element-name, model-u.element-fixed, r_node-children-content);
 		}
-		val = master_to_zval(model-u.element-encode, r_node);
+		val = master_to_zval(model-u.element-encode, r_node TSRMLS_CC);
 	} else if (model-u.element-fixed) {
 		xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST(BOGUS));
 		xmlNodeSetContent(dummy, BAD_CAST(model-u.element-fixed));
-		val = master_to_zval(model-u.element-encode, dummy);
+		val = master_to_zval(model-u.element-encode, dummy TSRMLS_CC);
 		xmlFreeNode(dummy);
 	} else if (model-u.element-def  !model-u.element-nillable) {
 		xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST(BOGUS));
 		xmlNodeSetContent(dummy, BAD_CAST(model-u.element-def));
-		val = master_to_zval(model-u.element-encode, dummy);
+		val = master_to_zval(model-u.element-encode, dummy TSRMLS_CC);
 		xmlFreeNode(dummy);
 	} else {
-		val = master_to_zval(model-u.element-encode, r_node);
+		val = master_to_zval(model-u.element-encode, r_node TSRMLS_CC);
 	}
 	if ((node = get_node(node-next, model-u.element-name)) != NULL) {
 		zval *array;
@@ -1380,19 +1377,19 @@
 if (model-u.element-fixed  strcmp(model-u.element-fixed, (char*)node-children-content) != 0) {
 	soap_error3(E_ERROR, Encoding: Element '%s' has fixed value '%s' (value '%s' is not allowed), model-u.element-name, model-u.element-fixed, node-children-content);

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/dba/config.m4 ext/dba/dba.c ext/dba/dba_tcadb.c ext/dba/php_tcadb.h ext/dba/tests/dba_tcadb.phpt

2010-03-24 Thread Michael Maclean

mgdm Wed, 24 Mar 2010 23:38:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296760

Log:
Add Tokyo Cabinet abstract DB support to ext/dba

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/ext/dba/config.m4
U   php/php-src/trunk/ext/dba/dba.c
A   php/php-src/trunk/ext/dba/dba_tcadb.c
A   php/php-src/trunk/ext/dba/php_tcadb.h
A   php/php-src/trunk/ext/dba/tests/dba_tcadb.phpt

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS	2010-03-24 23:05:22 UTC (rev 296759)
+++ php/php-src/trunk/NEWS	2010-03-24 23:38:59 UTC (rev 296760)
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 201?, PHP 5.3.99
+- Added Tokyo Cabinet abstract DB support to ext/dba. (Michael Maclean)
 - Added Jenkins's one-at-a-time hash support to ext/hash. (Martin Jansen)
 - Added FNV-1 hash support to ext/hash. (Michael Maclean)
 - default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)

Modified: php/php-src/trunk/ext/dba/config.m4
===
--- php/php-src/trunk/ext/dba/config.m4	2010-03-24 23:05:22 UTC (rev 296759)
+++ php/php-src/trunk/ext/dba/config.m4	2010-03-24 23:38:59 UTC (rev 296760)
@@ -97,6 +97,10 @@
 PHP_ARG_WITH(dbm,,
 [  --with-dbm[=DIR]  DBA: DBM support], no, no)

+PHP_ARG_WITH(tcadb,,
+[  --with-tcadb[=DIR]DBA: Tokyo Cabinet abstract DB support], no, no)
+
+
 dnl
 dnl Library checks
 dnl
@@ -193,6 +197,37 @@
 fi
 PHP_DBA_STD_RESULT(ndbm)

+dnl TCADB
+if test $PHP_TCADB != no; then
+  PHP_DBA_STD_BEGIN
+  for i in $PHP_TCADB /usr/local /usr; do
+	if test -f $i/include/tcadb.h; then
+	  THIS_PREFIX=$i
+	  PHP_ADD_INCLUDE($THIS_PREFIX/include)
+	  THIS_INCLUDE=$i/include/tcadb.h
+	  break
+	fi
+  done
+
+  if test -n $THIS_INCLUDE; then
+	for LIB in tokyocabinet; do
+	  PHP_CHECK_LIBRARY($LIB, tcadbopen, [
+		AC_DEFINE_UNQUOTED(TCADB_INCLUDE_FILE, $THIS_INCLUDE, [ ])
+		AC_DEFINE(DBA_TCADB, 1, [ ])
+		THIS_LIBS=$LIB
+	  ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
+	  if test -n $THIS_LIBS; then
+		break
+	  fi
+	done
+  fi
+
+  PHP_DBA_STD_ASSIGN
+  PHP_DBA_STD_CHECK
+  PHP_DBA_STD_ATTACH
+fi
+PHP_DBA_STD_RESULT(tcadb)
+
 dnl Berkeley specific (library and version test)
 dnl parameters(version, library list, function)
 AC_DEFUN([PHP_DBA_DB_CHECK],[
@@ -577,7 +612,7 @@
 AC_MSG_RESULT([yes])
   fi
   AC_DEFINE(HAVE_DBA, 1, [ ])
-  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources, $ext_shared)
+  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c dba_tcadb.c $cdb_sources $flat_sources $ini_sources, $ext_shared)
   PHP_ADD_BUILD_DIR($ext_builddir/libinifile)
   PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
   PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)

Modified: php/php-src/trunk/ext/dba/dba.c
===
--- php/php-src/trunk/ext/dba/dba.c	2010-03-24 23:05:22 UTC (rev 296759)
+++ php/php-src/trunk/ext/dba/dba.c	2010-03-24 23:38:59 UTC (rev 296760)
@@ -50,6 +50,7 @@
 #include php_flatfile.h
 #include php_inifile.h
 #include php_qdbm.h
+#include php_tcadb.h

 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
@@ -337,6 +338,9 @@
 #if DBA_QDBM
 	DBA_HND(qdbm, DBA_LOCK_EXT)
 #endif
+#if DBA_TCADB
+	DBA_HND(tcadb, DBA_LOCK_ALL)
+#endif
 	{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 };

@@ -358,6 +362,8 @@
 #define DBA_DEFAULT dbm
 #elif DBA_QDBM
 #define DBA_DEFAULT qdbm
+#elif DBA_TCADB
+#define DBA_DEFAULT tcadb
 #else
 #define DBA_DEFAULT 
 #endif

Added: php/php-src/trunk/ext/dba/dba_tcadb.c
===
--- php/php-src/trunk/ext/dba/dba_tcadb.c	(rev 0)
+++ php/php-src/trunk/ext/dba/dba_tcadb.c	2010-03-24 23:38:59 UTC (rev 296760)
@@ -0,0 +1,221 @@
+/*
+   +--+
+   | PHP Version 5|
+   +--+
+   | Copyright (c) 1997-2010 The PHP Group|
+   +--+
+   | This source file is subject to version 3.01 of the PHP license,  |
+   | that is bundled with this package in the file LICENSE, and is|
+   | available through the world-wide-web at the following url:   |
+   | http://www.php.net/license/3_01.txt

[PHP-CVS] svn: /php/php-src/trunk/ext/hash/ config.m4 hash.c hash_fnv.c php_hash.h php_hash_fnv.h tests/fnv132.phpt tests/fnv164.phpt

2010-03-23 Thread Michael Maclean

mgdm Tue, 23 Mar 2010 22:21:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296691

Log:
Add FNV-1 support to ext/hash

Changed paths:
U   php/php-src/trunk/ext/hash/config.m4
U   php/php-src/trunk/ext/hash/hash.c
A   php/php-src/trunk/ext/hash/hash_fnv.c
U   php/php-src/trunk/ext/hash/php_hash.h
A   php/php-src/trunk/ext/hash/php_hash_fnv.h
A   php/php-src/trunk/ext/hash/tests/fnv132.phpt
A   php/php-src/trunk/ext/hash/tests/fnv164.phpt

Modified: php/php-src/trunk/ext/hash/config.m4
===
--- php/php-src/trunk/ext/hash/config.m4	2010-03-23 22:08:17 UTC (rev 296690)
+++ php/php-src/trunk/ext/hash/config.m4	2010-03-23 22:21:39 UTC (rev 296691)
@@ -27,11 +27,11 @@

   EXT_HASH_SOURCES=hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \
 hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \
-hash_crc32.c hash_salsa.c
+hash_crc32.c hash_salsa.c hash_fnv.c
   EXT_HASH_HEADERS=php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \
 php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \
 php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_salsa.h \
-php_hash_types.h
+php_hash_fnv.h php_hash_types.h

   PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, $ext_shared)
   ifdef([PHP_INSTALL_HEADERS], [

Modified: php/php-src/trunk/ext/hash/hash.c
===
--- php/php-src/trunk/ext/hash/hash.c	2010-03-23 22:08:17 UTC (rev 296690)
+++ php/php-src/trunk/ext/hash/hash.c	2010-03-23 22:21:39 UTC (rev 296691)
@@ -74,7 +74,11 @@
 	{RIPEMD320, ripemd320, 25},
 	{NULL, NULL, 26}, /* support needs to be added for snefru 128 */
 	{SNEFRU256, snefru256, 27},
-	{MD2, md2, 28}
+	{MD2, md2, 28},
+	{FNV132, fnv132, 29},
+	{FNV1a32, fnv1a32, 30},
+	{FNV164, fnv164, 31},
+	{FNV1a64, fnv1a64, 32},
 };
 #endif

@@ -841,6 +845,8 @@
 	php_hash_register_algo(crc32b,		php_hash_crc32b_ops);
 	php_hash_register_algo(salsa10,		php_hash_salsa10_ops);
 	php_hash_register_algo(salsa20,		php_hash_salsa20_ops);
+	php_hash_register_algo(fnv132,		php_hash_fnv132_ops);
+	php_hash_register_algo(fnv164,		php_hash_fnv164_ops);

 	PHP_HASH_HAVAL_REGISTER(3,128);
 	PHP_HASH_HAVAL_REGISTER(3,160);

Added: php/php-src/trunk/ext/hash/hash_fnv.c
===
--- php/php-src/trunk/ext/hash/hash_fnv.c	(rev 0)
+++ php/php-src/trunk/ext/hash/hash_fnv.c	2010-03-23 22:21:39 UTC (rev 296691)
@@ -0,0 +1,229 @@
+/*
+  +--+
+  | PHP Version 5|
+  +--+
+  | Copyright (c) 1997-2010 The PHP Group|
+  +--+
+  | This source file is subject to version 3.01 of the PHP license,  |
+  | that is bundled with this package in the file LICENSE, and is|
+  | available through the world-wide-web at the following url:   |
+  | http://www.php.net/license/3_01.txt  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to  |
+  | lice...@php.net so we can mail you a copy immediately.   |
+  +--+
+  | Author: Michael Maclean m...@php.net   |
+  +--+
+*/
+
+/* $Id$ */
+
+/*  Based on the public domain algorithm found at
+	http://www.isthe.com/chongo/tech/comp/fnv/index.html */
+
+#include php_hash.h
+#include php_hash_fnv.h
+
+const php_hash_ops php_hash_fnv132_ops = {
+	(php_hash_init_func_t) PHP_FNV132Init,
+	(php_hash_update_func_t) PHP_FNV132Update,
+	(php_hash_final_func_t) PHP_FNV132Final,
+	(php_hash_copy_func_t) php_hash_copy,
+	4,
+	4,
+	sizeof(PHP_FNV132_CTX)
+};
+
+	const php_hash_ops php_hash_fnv1a32_ops = {
+	(php_hash_init_func_t) PHP_FNV132Init,
+	(php_hash_update_func_t) PHP_FNV1a32Update,
+ 	(php_hash_final_func_t) PHP_FNV132Final,
+	(php_hash_copy_func_t) php_hash_copy,
+	4,
+	4,
+	sizeof(PHP_FNV132_CTX)
+};
+
+const php_hash_ops php_hash_fnv164_ops = {
+	(php_hash_init_func_t) PHP_FNV164Init,
+	(php_hash_update_func_t) PHP_FNV164Update,
+	(php_hash_final_func_t) PHP_FNV164Final,
+	(php_hash_copy_func_t) php_hash_copy,
+	8,
+	4,
+	sizeof(PHP_FNV164_CTX)
+};
+
+const php_hash_ops php_hash_fnv1a64_ops = {
+	(php_hash_init_func_t) PHP_FNV164Init,
+	(php_hash_update_func_t) PHP_FNV1a64Update,
+ 	(php_hash_final_func_t) PHP_FNV164Final,
+	(php_hash_copy_func_t) php_hash_copy,
+	8,
+	4,
+	sizeof(PHP_FNV164_CTX

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/hash/hash.c

2010-03-23 Thread Michael Maclean

mgdm Tue, 23 Mar 2010 23:39:09 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296692

Log:
Minor fix to constants registered in ext/hash, and update NEWS

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/ext/hash/hash.c

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2010-03-23 22:21:39 UTC (rev 296691)
+++ php/php-src/trunk/NEWS  2010-03-23 23:39:09 UTC (rev 296692)
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 201?, PHP 5.3.99
+- Added FNV-1 hash support to ext/hash. (Michael Maclean)
 - default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)

 ?? ??? 20??, PHP 5.3.3

Modified: php/php-src/trunk/ext/hash/hash.c
===
--- php/php-src/trunk/ext/hash/hash.c   2010-03-23 22:21:39 UTC (rev 296691)
+++ php/php-src/trunk/ext/hash/hash.c   2010-03-23 23:39:09 UTC (rev 296692)
@@ -76,9 +76,9 @@
{SNEFRU256, snefru256, 27},
{MD2, md2, 28},
{FNV132, fnv132, 29},
-   {FNV1a32, fnv1a32, 30},
+   {FNV1A32, fnv1a32, 30},
{FNV164, fnv164, 31},
-   {FNV1a64, fnv1a64, 32},
+   {FNV1A64, fnv1a64, 32},
 };
 #endif


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ basic_functions.c

[PHP-CVS] svn: /php/php-src/trunk/ext/soap/ php_encoding.c php_encoding.h

[PHP-CVS] svn: /php/php-src/trunk/ext/soap/ php_encoding.c php_encoding.h php_packet_soap.c soap.c

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/dba/config.m4 ext/dba/dba.c ext/dba/dba_tcadb.c ext/dba/php_tcadb.h ext/dba/tests/dba_tcadb.phpt

[PHP-CVS] svn: /php/php-src/trunk/ext/hash/ config.m4 hash.c hash_fnv.c php_hash.h php_hash_fnv.h tests/fnv132.phpt tests/fnv164.phpt

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/hash/hash.c

6 matches

Site Navigation

Mail list logo

Footer information