Re: cvs: php4 /ext/dbplus dbplus.c php_dbplus.c

Best if you use php_strtok_r() as it's thread safe. strtok() is not thread-safe on all systems. Andi At 03:18 PM 9/16/2001 +0000, Hartmut Holzgraefe wrote:

hholzgra                Sun Sep 16 11:18:03 2001 EDT

Modified files:

    /php4/ext/dbplus    dbplus.c php_dbplus.c

Log: compiles without warnings now Index: php4/ext/dbplus/dbplus.c diff -u php4/ext/dbplus/dbplus.c:1.7 php4/ext/dbplus/dbplus.c:1.8

--- php4/ext/dbplus/dbplus.c:1.7        Sun Aug 26 10:26:36 2001
+++ php4/ext/dbplus/dbplus.c    Sun Sep 16 11:18:02 2001

@@ -18,6 +18,7 @@ */ #include "php.h" +#include "ext/standard/info.h" #include "php_ini.h" #include "php_dbplus.h" Index: php4/ext/dbplus/php_dbplus.c diff -u php4/ext/dbplus/php_dbplus.c:1.5 php4/ext/dbplus/php_dbplus.c:1.6

--- php4/ext/dbplus/php_dbplus.c:1.5    Thu Sep 13 15:52:57 2001
+++ php4/ext/dbplus/php_dbplus.c        Sun Sep 16 11:18:03 2001

@@ -25,7 +25,11 @@ #include <relation.h> #include <dblight.h> - +/* missing prototypes in dbplus header files */ +void string_to_scalop(char *op, enum scalop *sop); +field * string_to_field(char *val, attribute *ap, int flags); +void cdb_tcl(int,char *,char **, int *); +relf * aql_exec(char *, char *); #define _STRING(x) ((*x)->value.str.val)

 #define _INT(x)    ((*x)->value.lval)

@@ -112,7 +116,6 @@ {

     register attribute *ap ;
     unsigned deg ;
-    char buf[20];
     zval *element;

     zval_dtor(*zv);

@@ -179,12 +182,8 @@ { attribute *ap; static constraint c; - int len; - int alen; field *f; enum scalop sop; - int n_elems; - int n; char * dom; char * val; char * op; @@ -298,7 +297,7 @@

    Add a tuple to a relation */

PHP_FUNCTION(dbplus_add) { - zval **relation, **data, **element; + zval **relation, **data; enum errorcond stat = ERR_UNKNOWN; relf *r; tuple t; @@ -561,7 +560,7 @@

    Release write lock on tuple */

PHP_FUNCTION(dbplus_freelock) { - zval **relation, **data, **element; + zval **relation, **data; enum errorcond stat = ERR_UNKNOWN; relf *r; tuple t; @@ -603,7 +602,7 @@

    Request locking of tuple */

PHP_FUNCTION(dbplus_getlock) { - zval **relation, **data, **element; + zval **relation, **data; enum errorcond stat = ERR_UNKNOWN; relf *r; tuple t; @@ -738,7 +737,7 @@

    Get next tuple from relation */

PHP_FUNCTION(dbplus_next) { - zval **relation, **tname, *element; + zval **relation, **tname; relf *r; tuple t; int stat; @@ -1044,8 +1043,9 @@ } else {

     convert_to_string_ex(domlist);
     name = estrdup(_STRING(domlist));
-    while (p = strtok(nkeys ? 0 : name, " \t"))
+    while ( ( p = strtok ( nkeys ? 0 : name, " \t") ) ) {
       keys[nkeys++] = p;
+               }

} rnew = cdbRkeys(r, nkeys, keys); @@ -1158,8 +1158,9 @@ } else {

     convert_to_string_ex(domlist);
     name = estrdup(_STRING(domlist));
-    while (p = strtok(nkeys ? 0 : name, "   "))
+    while ( ( p = strtok ( nkeys ? 0 : name, "   ") ) ) {
       keys[nkeys++] = p;
+               }

} convert_to_long_ex(compact); @@ -1204,7 +1205,7 @@ /* todo: optional argument */ relf *r; - zval **relation, **truncate; + zval **relation; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){

     WRONG_PARAM_COUNT;

} -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net For additional commands, e-mail: php-cvs-help@lists.php.net To contact the list administrators, e-mail: php-list-admin@lists.php.net