cvs: php4 /sapi/apache2filter apache_config.c php_apache.h sapi_apache2.c

sas Thu Nov 2 07:19:54 2000 EDT Modified files: /php4/sapi/apache2filter apache_config.c php_apache.h sapi_apache2.c Log: Namespace protect dir_cmds and kill some warnings Index: php4/sapi/apache2filter/apache_config.c diff -u php4/sapi/apache2filter/apache_config.c:1.5 php4/sapi/apache2filter/apache_config.c:1.6 --- php4/sapi/apache2filter/apache_config.c:1.5 Thu Nov 2 07:01:25 2000 +++ php4/sapi/apache2filter/apache_config.c Thu Nov 2 07:19:54 2000 @@ -56,7 +56,7 @@ str_len = strlen(name); - if (zend_hash_find(&d->config, name, str_len + 1, &pe) == SUCCESS) { + if (zend_hash_find(&d->config, name, str_len + 1, (void **) &pe) == SUCCESS) { if (pe->status > status) return NULL; } @@ -90,8 +90,8 @@ zend_hash_get_current_key_ex(&d->config, &str, &str_len, &num_index, NULL) == HASH_KEY_IS_STRING; zend_hash_move_forward(&d->config)) { pe = NULL; - zend_hash_get_current_data(&d->config, &data); - if (zend_hash_find(&e->config, str, str_len, &pe) == SUCCESS) { + zend_hash_get_current_data(&d->config, (void **) &data); + if (zend_hash_find(&e->config, str, str_len, (void **) &pe) == SUCCESS) { if (pe->status >= data->status) continue; } zend_hash_update(&e->config, str, str_len, data, sizeof(*data), NULL); @@ -110,7 +110,7 @@ for (zend_hash_internal_pointer_reset(&d->config); zend_hash_get_current_key_ex(&d->config, &str, &str_len, NULL, NULL) == HASH_KEY_IS_STRING; zend_hash_move_forward(&d->config)) { - zend_hash_get_current_data(&d->config, &data); + zend_hash_get_current_data(&d->config, (void **) &data); fprintf(stderr, "APPLYING (%s)(%s)\n", str, data->value); if (zend_alter_ini_entry(str, str_len, data->value, data->value_len + 1, data->status, PHP_INI_STAGE_RUNTIME) == FAILURE) @@ -118,7 +118,7 @@ } } -const command_rec dir_cmds[] = +const command_rec php_dir_cmds[] = { AP_INIT_TAKE2("php_value", php_apache_value_handler, NULL, OR_OPTIONS, "PHP Value Modifier"), Index: php4/sapi/apache2filter/php_apache.h diff -u php4/sapi/apache2filter/php_apache.h:1.4 php4/sapi/apache2filter/php_apache.h:1.5 --- php4/sapi/apache2filter/php_apache.h:1.4 Sun Oct 29 09:43:23 2000 +++ php4/sapi/apache2filter/php_apache.h Thu Nov 2 07:19:54 2000 @@ -34,6 +34,6 @@ void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf); void *create_php_config(apr_pool_t *p, char *dummy); void apply_config(void *); -extern const command_rec dir_cmds[]; +extern const command_rec php_dir_cmds[]; #endif /* PHP_APACHE_H */ Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.17 php4/sapi/apache2filter/sapi_apache2.c:1.18 --- php4/sapi/apache2filter/sapi_apache2.c:1.17 Wed Nov 1 11:26:57 2000 +++ php4/sapi/apache2filter/sapi_apache2.c Thu Nov 2 07:19:54 2000 @@ -427,10 +427,10 @@ module MODULE_VAR_EXPORT php4_module = { STANDARD20_MODULE_STUFF, create_php_config, /* create per-directory config structure */ - merge_php_config, /* merge per-directory config structures */ + merge_php_config, /* merge per-directory config structures */ NULL, /* create per-server config structure */ NULL, /* merge per-server config structures */ - dir_cmds, /* command apr_table_t */ + php_dir_cmds, /* command apr_table_t */ NULL, /* handlers */ php_register_hook /* register hooks */ };