CVS update: php3/functions

Date: Friday April 9, 1999 @ 5:50 Author: sas Update of /repository/php3/functions In directory asf:/u/temp/cvs-serv23191/functions Modified Files: dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c php3_cdb.h php3_dba.h php3_dbm.h php3_gdbm.h php3_ndbm.h Log Message: more cleanup Index: php3/functions/dba.c diff -c php3/functions/dba.c:1.2 php3/functions/dba.c:1.3 *** php3/functions/dba.c:1.2 Fri Apr 9 05:06:34 1999 --- php3/functions/dba.c Fri Apr 9 05:50:52 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: dba.c,v 1.2 1999/04/09 09:06:34 sas Exp $ */ #include "php.h" #include "php3_list.h" --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: dba.c,v 1.3 1999/04/09 09:50:52 sas Exp $ */ #include "php.h" #include "php3_list.h" *************** *** 65,71 **** typedef struct dba_handler { char *name; ! int (*open)(const dba_info *, const char *, const dba_mode_t); void (*close)(const dba_info *); char* (*fetch)(const dba_info *, const char *, int *); int (*update)(const dba_info *, const char *, const char *, const int, const int); --- 65,71 ---- typedef struct dba_handler { char *name; ! int (*open)(const dba_info *); void (*close)(const dba_info *); char* (*fetch)(const dba_info *, const char *, int *); int (*update)(const dba_info *, const char *, const char *, const int, const int); *************** *** 141,147 **** /* {{{ dba_close */ static void dba_close(dba_info *info) { ! info->hnd->close(info); efree(info); } /* }}} */ --- 141,148 ---- /* {{{ dba_close */ static void dba_close(dba_info *info) { ! if(info->hnd) info->hnd->close(info); ! if(info->path) efree(info->path); efree(info); } /* }}} */ *************** *** 159,165 **** { dba_handler *hptr; ! PUTS("V1 ($Id: dba.c,v 1.2 1999/04/09 09:06:34 sas Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); --- 160,166 ---- { dba_handler *hptr; ! PUTS("V1 ($Id: dba.c,v 1.3 1999/04/09 09:50:52 sas Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); *************** *** 213,220 **** RETURN_FALSE; } - printf("found handler: %s\n", hptr->name); - switch(mode->value.str.val[0]) { case 'w': modenr = DBA_WRITER; --- 214,219 ---- *************** *** 229,241 **** info = emalloc(sizeof(*info)); memset(info, 0, sizeof(info)); ! info->hnd = hptr; ! if(info->hnd->open(info, path->value.str.val, modenr) != SUCCESS) { ! efree(info); php3_error(E_WARNING, "driver initialization failed"); RETURN_FALSE; } RETURN_LONG(php3_list_insert(info, GLOBAL(le_db))); } --- 228,242 ---- info = emalloc(sizeof(*info)); memset(info, 0, sizeof(info)); + info->path = estrndup(path->value.str.val, path->value.str.len); + info->mode = modenr; ! if(hptr->open(info) != SUCCESS) { ! dba_close(info); php3_error(E_WARNING, "driver initialization failed"); RETURN_FALSE; } + info->hnd = hptr; RETURN_LONG(php3_list_insert(info, GLOBAL(le_db))); } Index: php3/functions/dba_cdb.c diff -c php3/functions/dba_cdb.c:1.3 php3/functions/dba_cdb.c:1.4 *** php3/functions/dba_cdb.c:1.3 Fri Apr 9 05:26:41 1999 --- php3/functions/dba_cdb.c Fri Apr 9 05:50:52 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: dba_cdb.c,v 1.3 1999/04/09 09:26:41 sas Exp $ */ #include "php.h" --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: dba_cdb.c,v 1.4 1999/04/09 09:50:52 sas Exp $ */ #include "php.h" *************** *** 52,64 **** uint32 pos; /* current position for traversing */ } dba_cdb; ! int CDB_FNCT(open,, const char *path, const dba_mode_t mode) { int gmode = 0; dba_cdb *cdb; dba_info *pinfo = (dba_info *) info; ! switch(mode) { case DBA_READER: gmode = O_RDONLY; break; /* currently not supported: */ case DBA_WRITER: gmode = O_RDWR | O_CREAT; break; --- 52,64 ---- uint32 pos; /* current position for traversing */ } dba_cdb; ! int CDB_FNCT(open) { int gmode = 0; dba_cdb *cdb; dba_info *pinfo = (dba_info *) info; ! switch(info->mode) { case DBA_READER: gmode = O_RDONLY; break; /* currently not supported: */ case DBA_WRITER: gmode = O_RDWR | O_CREAT; break; *************** *** 67,73 **** cdb = emalloc(sizeof *cdb); memset(cdb, 0, sizeof *cdb); ! cdb->fd = open(path, gmode); if(cdb->fd < 0) { efree(cdb); return FAILURE; --- 67,73 ---- cdb = emalloc(sizeof *cdb); memset(cdb, 0, sizeof *cdb); ! cdb->fd = open(info->path, gmode); if(cdb->fd < 0) { efree(cdb); return FAILURE; Index: php3/functions/dba_dbm.c diff -c php3/functions/dba_dbm.c:1.3 php3/functions/dba_dbm.c:1.4 *** php3/functions/dba_dbm.c:1.3 Fri Apr 9 04:42:03 1999 --- php3/functions/dba_dbm.c Fri Apr 9 05:50:52 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: dba_dbm.c,v 1.3 1999/04/09 08:42:03 sas Exp $ */ #include "php.h" --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: dba_dbm.c,v 1.4 1999/04/09 09:50:52 sas Exp $ */ #include "php.h" *************** *** 43,51 **** #define DBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = strlen(key) ! int DBM_FNCT(open,, const char *path, const dba_mode_t mode) { ! return (dbminit((char *) path) ? FAILURE : SUCCESS); } void DBM_FNCT(close) --- 43,51 ---- #define DBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = strlen(key) ! int DBM_FNCT(open) { ! return (dbminit((char *) info->path) ? FAILURE : SUCCESS); } void DBM_FNCT(close) Index: php3/functions/dba_gdbm.c diff -c php3/functions/dba_gdbm.c:1.1 php3/functions/dba_gdbm.c:1.2 *** php3/functions/dba_gdbm.c:1.1 Fri Apr 9 03:04:33 1999 --- php3/functions/dba_gdbm.c Fri Apr 9 05:50:52 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: dba_gdbm.c,v 1.1 1999/04/09 07:04:33 sas Exp $ */ #include "php.h" --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: dba_gdbm.c,v 1.2 1999/04/09 09:50:52 sas Exp $ */ #include "php.h" *************** *** 38,50 **** #define GDBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = strlen(key) ! int GDBM_FNCT(open,, const char *path, const dba_mode_t mode) { GDBM_FILE dbf; int gmode = 0; dba_info *pinfo = (dba_info *) info; ! switch(mode) { case DBA_READER: gmode = GDBM_READER; break; --- 38,50 ---- #define GDBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = strlen(key) ! int GDBM_FNCT(open) { GDBM_FILE dbf; int gmode = 0; dba_info *pinfo = (dba_info *) info; ! switch(info->mode) { case DBA_READER: gmode = GDBM_READER; break; *************** *** 56,62 **** break; } ! dbf = gdbm_open((char *) path, 0, gmode, 0644, NULL); if(dbf) { pinfo->dbf = dbf; --- 56,62 ---- break; } ! dbf = gdbm_open(info->path, 0, gmode, 0644, NULL); if(dbf) { pinfo->dbf = dbf; Index: php3/functions/dba_ndbm.c diff -c php3/functions/dba_ndbm.c:1.1 php3/functions/dba_ndbm.c:1.2 *** php3/functions/dba_ndbm.c:1.1 Fri Apr 9 03:04:33 1999 --- php3/functions/dba_ndbm.c Fri Apr 9 05:50:52 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: dba_ndbm.c,v 1.1 1999/04/09 07:04:33 sas Exp $ */ #include "php.h" --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: dba_ndbm.c,v 1.2 1999/04/09 09:50:52 sas Exp $ */ #include "php.h" *************** *** 45,57 **** #define NDBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = strlen(key) ! int NDBM_FNCT(open,, const char *path, const dba_mode_t mode) { DBM *dbf; int gmode = 0; dba_info *pinfo = (dba_info *) info; ! switch(mode) { case DBA_READER: gmode = O_RDONLY; break; --- 45,57 ---- #define NDBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = strlen(key) ! int NDBM_FNCT(open) { DBM *dbf; int gmode = 0; dba_info *pinfo = (dba_info *) info; ! switch(info->mode) { case DBA_READER: gmode = O_RDONLY; break; *************** *** 63,69 **** break; } ! dbf = dbm_open((char *) path, gmode, 0644); if(dbf) { pinfo->dbf = dbf; --- 63,69 ---- break; } ! dbf = dbm_open(info->path, gmode, 0644); if(dbf) { pinfo->dbf = dbf; Index: php3/functions/php3_cdb.h diff -c php3/functions/php3_cdb.h:1.1 php3/functions/php3_cdb.h:1.2 *** php3/functions/php3_cdb.h:1.1 Fri Apr 9 03:04:34 1999 --- php3/functions/php3_cdb.h Fri Apr 9 05:50:52 1999 *************** *** 7,13 **** #define CDB_FNCT(a,b...) _php3_cdb_##a(const dba_info *info b) ! int CDB_FNCT(open,, const char *path, const dba_mode_t mode); void CDB_FNCT(close); char *CDB_FNCT(fetch,, const char *key, int *newlen); int CDB_FNCT(update,, const char *key, const char *val, const int vallen, const int mode); --- 7,13 ---- #define CDB_FNCT(a,b...) _php3_cdb_##a(const dba_info *info b) ! int CDB_FNCT(open); void CDB_FNCT(close); char *CDB_FNCT(fetch,, const char *key, int *newlen); int CDB_FNCT(update,, const char *key, const char *val, const int vallen, const int mode); Index: php3/functions/php3_dba.h diff -c php3/functions/php3_dba.h:1.1 php3/functions/php3_dba.h:1.2 *** php3/functions/php3_dba.h:1.1 Fri Apr 9 03:04:33 1999 --- php3/functions/php3_dba.h Fri Apr 9 05:50:52 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: php3_dba.h,v 1.1 1999/04/09 07:04:33 sas Exp $ */ #ifndef _DBA_H #define _DBA_H --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php3_dba.h,v 1.2 1999/04/09 09:50:52 sas Exp $ */ #ifndef _DBA_H #define _DBA_H *************** *** 35,47 **** #include "internal_functions.h" typedef enum { ! DBA_READER, DBA_WRITER } dba_mode_t; typedef struct dba_info { /* public */ void *dbf; /* ptr to private data or whatever */ /* private */ struct dba_handler *hnd; } dba_info; --- 35,51 ---- #include "internal_functions.h" typedef enum { ! DBA_READER = 1, DBA_WRITER } dba_mode_t; typedef struct dba_info { /* public */ void *dbf; /* ptr to private data or whatever */ + char *path; + dba_mode_t mode; + char *user; + char *password; /* private */ struct dba_handler *hnd; } dba_info; Index: php3/functions/php3_dbm.h diff -c php3/functions/php3_dbm.h:1.1 php3/functions/php3_dbm.h:1.2 *** php3/functions/php3_dbm.h:1.1 Fri Apr 9 03:04:34 1999 --- php3/functions/php3_dbm.h Fri Apr 9 05:50:52 1999 *************** *** 7,13 **** #define DBM_FNCT(a,b...) _php3_dbm_##a(const dba_info *info b) ! int DBM_FNCT(open,, const char *path, const dba_mode_t mode); void DBM_FNCT(close); char *DBM_FNCT(fetch,, const char *key, int *newlen); int DBM_FNCT(update,, const char *key, const char *val, const int vallen, const int mode); --- 7,13 ---- #define DBM_FNCT(a,b...) _php3_dbm_##a(const dba_info *info b) ! int DBM_FNCT(open); void DBM_FNCT(close); char *DBM_FNCT(fetch,, const char *key, int *newlen); int DBM_FNCT(update,, const char *key, const char *val, const int vallen, const int mode); Index: php3/functions/php3_gdbm.h diff -c php3/functions/php3_gdbm.h:1.1 php3/functions/php3_gdbm.h:1.2 *** php3/functions/php3_gdbm.h:1.1 Fri Apr 9 03:04:34 1999 --- php3/functions/php3_gdbm.h Fri Apr 9 05:50:52 1999 *************** *** 7,13 **** #define GDBM_FNCT(a,b...) _php3_gdbm_##a(const dba_info *info b) ! int GDBM_FNCT(open,, const char *path, const dba_mode_t mode); void GDBM_FNCT(close); char *GDBM_FNCT(fetch,, const char *key, int *newlen); int GDBM_FNCT(update,, const char *key, const char *val, const int vallen, const int mode); --- 7,13 ---- #define GDBM_FNCT(a,b...) _php3_gdbm_##a(const dba_info *info b) ! int GDBM_FNCT(open); void GDBM_FNCT(close); char *GDBM_FNCT(fetch,, const char *key, int *newlen); int GDBM_FNCT(update,, const char *key, const char *val, const int vallen, const int mode); Index: php3/functions/php3_ndbm.h diff -c php3/functions/php3_ndbm.h:1.1 php3/functions/php3_ndbm.h:1.2 *** php3/functions/php3_ndbm.h:1.1 Fri Apr 9 03:04:34 1999 --- php3/functions/php3_ndbm.h Fri Apr 9 05:50:52 1999 *************** *** 7,13 **** #define NDBM_FNCT(a,b...) _php3_ndbm_##a(const dba_info *info b) ! int NDBM_FNCT(open,, const char *path, const dba_mode_t mode); void NDBM_FNCT(close); char *NDBM_FNCT(fetch,, const char *key, int *newlen); int NDBM_FNCT(update,, const char *key, const char *val, const int vallen, const int mode); --- 7,13 ---- #define NDBM_FNCT(a,b...) _php3_ndbm_##a(const dba_info *info b) ! int NDBM_FNCT(open); void NDBM_FNCT(close); char *NDBM_FNCT(fetch,, const char *key, int *newlen); int NDBM_FNCT(update,, const char *key, const char *val, const int vallen, const int mode); -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net