diff options
| author | Sascha Schumann <sas@php.net> | 2000-05-04 10:38:17 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-05-04 10:38:17 +0000 |
| commit | d0f3764ee2e10003d9c8ea4a1c17ff0be1303a9b (patch) | |
| tree | 10e61089a99c0d3226533f4b15693a45d82a931a /ext/hyperwave/hw.c | |
| parent | b6e4841ec7bcdc1b4fd3533fd4ffeefdac095d52 (diff) | |
| download | php-git-d0f3764ee2e10003d9c8ea4a1c17ff0be1303a9b.tar.gz | |
Change reentrancy API to always use the php prefix.
Check for the declaration of reentrant functions, so that we can use
them in non-ZTS mode on all platforms.
Diffstat (limited to 'ext/hyperwave/hw.c')
| -rw-r--r-- | ext/hyperwave/hw.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index cc51a92830..612b143a46 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -316,7 +316,7 @@ int make2_return_array_from_objrec(pval **return_value, char *objrec, zval *sarr to the return_value array. */ temp = estrdup(objrec); - attrname = strtok_r(temp, "\n", &strtok_buf); + attrname = php_strtok_r(temp, "\n", &strtok_buf); while(attrname != NULL) { zval *data, **dataptr; long spec; @@ -372,7 +372,7 @@ int make2_return_array_from_objrec(pval **return_value, char *objrec, zval *sarr } } - attrname = strtok_r(NULL, "\n", &strtok_buf); + attrname = php_strtok_r(NULL, "\n", &strtok_buf); } if(NULL == sarr){ // spec_arr->refcount--; @@ -413,7 +413,7 @@ int make_return_array_from_objrec(pval **return_value, char *objrec) { /* Fill Array of titles, descriptions and keywords */ temp = estrdup(objrec); - attrname = strtok_r(temp, "\n", &strtok_buf); + attrname = php_strtok_r(temp, "\n", &strtok_buf); while(attrname != NULL) { str = attrname; iTitle = 0; @@ -468,7 +468,7 @@ int make_return_array_from_objrec(pval **return_value, char *objrec) { if(iGroup) add_next_index_string(group_arr, str, 1); } - attrname = strtok_r(NULL, "\n", &strtok_buf); + attrname = php_strtok_r(NULL, "\n", &strtok_buf); } efree(temp); @@ -507,7 +507,7 @@ int make_return_array_from_objrec(pval **return_value, char *objrec) { /* All other attributes. Make a another copy first */ temp = estrdup(objrec); - attrname = strtok_r(temp, "\n", &strtok_buf); + attrname = php_strtok_r(temp, "\n", &strtok_buf); while(attrname != NULL) { str = attrname; /* We don't want to insert titles, descr., keywords a second time */ @@ -521,7 +521,7 @@ int make_return_array_from_objrec(pval **return_value, char *objrec) { str++; add_assoc_string(*return_value, attrname, str, 1); } - attrname = strtok_r(NULL, "\n", &strtok_buf); + attrname = php_strtok_r(NULL, "\n", &strtok_buf); } efree(temp); @@ -1171,7 +1171,7 @@ php_printf("%s\n", ptr); } temp = estrdup(ptr); - attrname = strtok_r(temp, "\n", &strtok_buf); + attrname = php_strtok_r(temp, "\n", &strtok_buf); i = 0; while(attrname != NULL) { char *name; @@ -1245,7 +1245,7 @@ php_printf("%s\n", ptr); /* Add the user array */ zend_hash_index_update(return_value->value.ht, i++, &user_arr, sizeof(pval), NULL); - attrname = strtok_r(NULL, "\n", &strtok_buf); + attrname = php_strtok_r(NULL, "\n", &strtok_buf); } efree(temp); efree(object); |