cvs: /php4/ext/db db.c php_db.h

zeev Fri Dec 17 16:20:30 1999 EDT Modified files: /php4/ext/db db.c php_db.h Log: More php3 cleanup Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.16 php4/ext/db/db.c:1.17 --- php4/ext/db/db.c:1.16 Fri Dec 17 15:54:49 1999 +++ php4/ext/db/db.c Fri Dec 17 16:19:59 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.16 1999/12/17 20:54:49 zeev Exp $ */ +/* $Id: db.c,v 1.17 1999/12/17 21:19:59 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -96,12 +96,12 @@ #define DBM_CLOSE(dbf) dbm_close(dbf) #define DBM_STORE(dbf, key, value, mode) dbm_store(dbf, key, value, mode) #define DBM_FETCH(dbf, key) dbm_fetch(dbf, key) -#define DBM_EXISTS(dbf, key) _php3_dbm_exists(dbf, key) +#define DBM_EXISTS(dbf, key) php_dbm_exists(dbf, key) #define DBM_DELETE(dbf, key) dbm_delete(dbf, key) #define DBM_FIRSTKEY(dbf) dbm_firstkey(dbf) #define DBM_NEXTKEY(dbf, key) dbm_nextkey(dbf) -static int _php3_dbm_exists(DBM *dbf, datum key_datum) { +static int php_dbm_exists(DBM *dbf, datum key_datum) { datum value_datum; int ret; @@ -171,7 +171,7 @@ /*needed for blocking calls in windows*/ void *dbm_mutex; -dbm_info *_php3_finddbm(pval *id,HashTable *list) +dbm_info *php_find_dbm(pval *id,HashTable *list) { list_entry *le; dbm_info *info; @@ -202,7 +202,7 @@ return info; } -static char *php3_get_info_db(void) +static char *php_get_info_db(void) { static char temp1[128]; static char temp[256]; @@ -240,12 +240,12 @@ PHP_MINFO_FUNCTION(db) { - php_printf(php3_get_info_db()); + php_printf(php_get_info_db()); } PHP_FUNCTION(dblist) { - char *str = php3_get_info_db(); + char *str = php_get_info_db(); RETURN_STRING(str,1); } @@ -469,7 +469,7 @@ convert_to_string(key); convert_to_string(value); - info = _php3_finddbm(id,list); + info = php_find_dbm(id,list); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -522,7 +522,7 @@ convert_to_string(key); convert_to_string(value); - info = _php3_finddbm(id,list); + info = php_find_dbm(id,list); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -576,7 +576,7 @@ } convert_to_string(key); - info = _php3_finddbm(id,list); + info = php_find_dbm(id,list); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -648,17 +648,17 @@ } convert_to_string(key); - info = _php3_finddbm(id,list); + info = php_find_dbm(id,list); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; } - ret = _php3_dbmexists(info, key->value.str.val); + ret = php_dbm_exists(info, key->value.str.val); RETURN_LONG(ret); } -int _php3_dbmexists(dbm_info *info, char *key) { +int php_dbm_exists(dbm_info *info, char *key) { datum key_datum; int ret; DBM_TYPE dbf; @@ -691,17 +691,17 @@ } convert_to_string(key); - info = _php3_finddbm(id,list); + info = php_find_dbm(id,list); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; } - ret = _php3_dbmdelete(info, key->value.str.val); + ret = php_dbm_delete(info, key->value.str.val); RETURN_LONG(ret); } -int _php3_dbmdelete(dbm_info *info, char *key) { +int php_dbm_delete(dbm_info *info, char *key) { datum key_datum; int ret; DBM_TYPE dbf; @@ -732,13 +732,13 @@ WRONG_PARAM_COUNT; } - info = _php3_finddbm(id,list); + info = php_find_dbm(id,list); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; } - ret = _php3_dbmfirstkey(info); + ret = php_dbm_first_key(info); if (!ret) { RETURN_FALSE; } else { @@ -748,7 +748,7 @@ } } -char *_php3_dbmfirstkey(dbm_info *info) { +char *php_dbm_first_key(dbm_info *info) { datum ret_datum; char *ret; DBM_TYPE dbf; @@ -790,13 +790,13 @@ } convert_to_string(key); - info = _php3_finddbm(id,list); + info = php_find_dbm(id,list); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; } - ret = _php3_dbmnextkey(info, key->value.str.val); + ret = php_dbm_nextkey(info, key->value.str.val); if (!ret) { RETURN_FALSE; } else { @@ -806,7 +806,7 @@ } } -char *_php3_dbmnextkey(dbm_info *info, char *key) { +char *php_dbm_nextkey(dbm_info *info, char *key) { datum key_datum, ret_datum; char *ret; DBM_TYPE dbf; Index: php4/ext/db/php_db.h diff -u php4/ext/db/php_db.h:1.2 php4/ext/db/php_db.h:1.3 --- php4/ext/db/php_db.h:1.2 Fri Dec 17 15:54:50 1999 +++ php4/ext/db/php_db.h Fri Dec 17 16:19:59 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_db.h,v 1.2 1999/12/17 20:54:50 zeev Exp $ */ +/* $Id: php_db.h,v 1.3 1999/12/17 21:19:59 zeev Exp $ */ #ifndef _PHP_DB_H @@ -62,16 +62,16 @@ #define phpext_db_ptr NULL #endif -dbm_info *_php3_finddbm(pval *id,HashTable *list); +dbm_info *php_find_dbm(pval *id,HashTable *list); int php_dbm_close(dbm_info *info); dbm_info *php_dbm_open(char *filename, char *mode); int php_dbm_insert(dbm_info *info, char *key, char *value); char *php_dbm_fetch(dbm_info *info, char *key); int php_dbm_replace(dbm_info *info, char *key, char *value); -int _php3_dbmexists(dbm_info *info, char *key); -int _php3_dbmdelete(dbm_info *info, char *key); -char *_php3_dbmfirstkey(dbm_info *info); -char *_php3_dbmnextkey(dbm_info *info, char *key); +int php_dbm_exists(dbm_info *info, char *key); +int php_dbm_delete(dbm_info *info, char *key); +char *php_dbm_first_key(dbm_info *info); +char *php_dbm_nextkey(dbm_info *info, char *key); /* db file functions */ PHP_MINIT_FUNCTION(db);