summaryrefslogtreecommitdiff
path: root/ext/dba
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-12-17 21:34:28 +0000
committerZeev Suraski <zeev@php.net>1999-12-17 21:34:28 +0000
commit502bb9c746e3d07cf8c5faa18b38497a0a6773bc (patch)
tree3c2c8d35b267b2e42ef1311ec8ff4ecb33987cec /ext/dba
parent59a3b83bf56b0aa837c7c11adca15a318b0bd99d (diff)
downloadphp-git-502bb9c746e3d07cf8c5faa18b38497a0a6773bc.tar.gz
More php3 cleanup
Diffstat (limited to 'ext/dba')
-rw-r--r--ext/dba/dba.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 56a5f3aa59..d448441e47 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -180,7 +180,6 @@ static void dba_close(dba_info *info)
free(info);
}
/* }}} */
- /* {{{ php3_minit_dba */
static PHP_MINIT_FUNCTION(dba)
{
@@ -189,16 +188,12 @@ static PHP_MINIT_FUNCTION(dba)
GLOBAL(le_pdb) = register_list_destructors(NULL, dba_close);
return SUCCESS;
}
-/* }}} */
- /* {{{ php3_mshutdown_dba */
static PHP_MSHUTDOWN_FUNCTION(dba)
{
zend_hash_destroy(&ht_keys);
return SUCCESS;
}
-/* }}} */
- /* {{{ php3_info_dba */
static PHP_MINFO_FUNCTION(dba)
{
@@ -210,10 +205,8 @@ static PHP_MINFO_FUNCTION(dba)
PUTS(hptr->name);
}
}
-/* }}} */
- /* {{{ _php3_dba_update */
-static void _php3_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
+static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
{
DBA_ID_PARS;
pval **val, **key;
@@ -231,12 +224,10 @@ static void _php3_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
RETURN_TRUE;
RETURN_FALSE;
}
-/* }}} */
- /* {{{ _php3_dba_open */
#define FREENOW if(args) efree(args); if(key) efree(key)
-static void _php3_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
+static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{
pval ***args = (pval ***) NULL;
int ac = ARG_COUNT(ht);
@@ -343,7 +334,7 @@ static void _php3_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
opens path using the specified handler in mode persistently */
PHP_FUNCTION(dba_popen)
{
- _php3_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+ php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
/* }}} */
@@ -351,7 +342,7 @@ PHP_FUNCTION(dba_popen)
opens path using the specified handler in mode*/
PHP_FUNCTION(dba_open)
{
- _php3_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+ php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
/* }}} */
@@ -441,7 +432,7 @@ PHP_FUNCTION(dba_delete)
inserts value as key, returns false, if key exists already */
PHP_FUNCTION(dba_insert)
{
- _php3_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+ php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
/* }}} */
@@ -449,7 +440,7 @@ PHP_FUNCTION(dba_insert)
inserts value as key, replaces key, if key exists already */
PHP_FUNCTION(dba_replace)
{
- _php3_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+ php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
/* }}} */