pajoye Sun Nov 30 23:07:14 2008 UTC
Modified files:
/php-src/ext/dba dba_db1.c
Log:
- fix line ending
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba_db1.c?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/dba/dba_db1.c
diff -u php-src/ext/dba/dba_db1.c:1.6 php-src/ext/dba/dba_db1.c:1.7
--- php-src/ext/dba/dba_db1.c:1.6 Mon Dec 31 07:12:08 2007
+++ php-src/ext/dba/dba_db1.c Sun Nov 30 23:07:14 2008
@@ -1,197 +1,197 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2008 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | [EMAIL PROTECTED] so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Shen Cheng-Da <[EMAIL PROTECTED]> |
- +----------------------------------------------------------------------+
- */
-
-/* $Id: dba_db1.c,v 1.6 2007/12/31 07:12:08 sebastian Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-
-#if DBA_DB1
-#include "php_db1.h"
-
-#ifdef DB1_INCLUDE_FILE
-#include DB1_INCLUDE_FILE
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define DB1_DATA dba_db1_data *dba = info->dbf
-#define DB1_GKEY DBT gkey; gkey.data = (char *) key; gkey.size = keylen
-
-typedef struct {
- DB *dbp;
-} dba_db1_data;
-
-DBA_OPEN_FUNC(db1)
-{
- dba_db1_data *dba;
- DB *db;
-
- int gmode;
- int filemode = 0644;
-
- if (info->argc > 0) {
- convert_to_long_ex(info->argv[0]);
- filemode = Z_LVAL_PP(info->argv[0]);
- }
-
- gmode = 0;
- switch (info->mode) {
- case DBA_READER:
- gmode = O_RDONLY;
- break;
- case DBA_WRITER:
- gmode = O_RDWR;
- break;
- case DBA_CREAT:
- gmode = O_RDWR | O_CREAT;
- break;
- case DBA_TRUNC:
- gmode = O_RDWR | O_CREAT | O_TRUNC;
- break;
- default:
- return FAILURE; /* not possible */
- }
-
- db = dbopen((char *)info->path, gmode, filemode, DB_HASH, NULL);
-
- if (db == NULL) {
- return FAILURE;
- }
-
- dba = pemalloc(sizeof(*dba), info->flags&DBA_PERSISTENT);
- dba->dbp = db;
-
- info->dbf = dba;
-
- return SUCCESS;
-}
-
-DBA_CLOSE_FUNC(db1)
-{
- DB1_DATA;
- dba->dbp->close(dba->dbp);
- pefree(info->dbf, info->flags&DBA_PERSISTENT);
-}
-
-DBA_FETCH_FUNC(db1)
-{
- DBT gval;
- DB1_DATA;
- DB1_GKEY;
-
- memset(&gval, 0, sizeof(gval));
- if (dba->dbp->get(dba->dbp, &gkey, &gval, 0) == RET_SUCCESS) {
- if (newlen) *newlen = gval.size;
- return estrndup(gval.data, gval.size);
- }
- return NULL;
-}
-
-DBA_UPDATE_FUNC(db1)
-{
- DBT gval;
- DB1_DATA;
- DB1_GKEY;
-
- gval.data = (char *) val;
- gval.size = vallen;
-
- return dba->dbp->put(dba->dbp, &gkey, &gval, mode == 1 ? R_NOOVERWRITE
: 0) != RET_SUCCESS ? FAILURE : SUCCESS;
-}
-
-DBA_EXISTS_FUNC(db1)
-{
- DBT gval;
- DB1_DATA;
- DB1_GKEY;
-
- return dba->dbp->get(dba->dbp, &gkey, &gval, 0) != RET_SUCCESS ?
FAILURE : SUCCESS;
-}
-
-DBA_DELETE_FUNC(db1)
-{
- DB1_DATA;
- DB1_GKEY;
-
- return dba->dbp->del(dba->dbp, &gkey, 0) != RET_SUCCESS ? FAILURE :
SUCCESS;
-}
-
-DBA_FIRSTKEY_FUNC(db1)
-{
- DBT gkey;
- DBT gval;
- DB1_DATA;
-
- memset(&gkey, 0, sizeof(gkey));
- memset(&gval, 0, sizeof(gval));
-
- if (dba->dbp->seq(dba->dbp, &gkey, &gval, R_FIRST) == RET_SUCCESS) {
- if (newlen) *newlen = gkey.size;
- return estrndup(gkey.data, gkey.size);
- }
- return NULL;
-}
-
-DBA_NEXTKEY_FUNC(db1)
-{
- DBT gkey;
- DBT gval;
- DB1_DATA;
-
- memset(&gkey, 0, sizeof(gkey));
- memset(&gval, 0, sizeof(gval));
-
- if (dba->dbp->seq(dba->dbp, &gkey, &gval, R_NEXT) == RET_SUCCESS) {
- if (newlen) *newlen = gkey.size;
- return estrndup(gkey.data, gkey.size);
- }
- return NULL;
-}
-
-DBA_OPTIMIZE_FUNC(db1)
-{
- /* dummy */
- return SUCCESS;
-}
-
-DBA_SYNC_FUNC(db1)
-{
- return SUCCESS;
-}
-
-DBA_INFO_FUNC(db1)
-{
- return estrdup(DB1_VERSION);
-}
-
-#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2008 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Shen Cheng-Da <[EMAIL PROTECTED]> |
+ +----------------------------------------------------------------------+
+ */
+
+/* $Id: dba_db1.c,v 1.7 2008/11/30 23:07:14 pajoye Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+
+#if DBA_DB1
+#include "php_db1.h"
+
+#ifdef DB1_INCLUDE_FILE
+#include DB1_INCLUDE_FILE
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#define DB1_DATA dba_db1_data *dba = info->dbf
+#define DB1_GKEY DBT gkey; gkey.data = (char *) key; gkey.size = keylen
+
+typedef struct {
+ DB *dbp;
+} dba_db1_data;
+
+DBA_OPEN_FUNC(db1)
+{
+ dba_db1_data *dba;
+ DB *db;
+
+ int gmode;
+ int filemode = 0644;
+
+ if (info->argc > 0) {
+ convert_to_long_ex(info->argv[0]);
+ filemode = Z_LVAL_PP(info->argv[0]);
+ }
+
+ gmode = 0;
+ switch (info->mode) {
+ case DBA_READER:
+ gmode = O_RDONLY;
+ break;
+ case DBA_WRITER:
+ gmode = O_RDWR;
+ break;
+ case DBA_CREAT:
+ gmode = O_RDWR | O_CREAT;
+ break;
+ case DBA_TRUNC:
+ gmode = O_RDWR | O_CREAT | O_TRUNC;
+ break;
+ default:
+ return FAILURE; /* not possible */
+ }
+
+ db = dbopen((char *)info->path, gmode, filemode, DB_HASH, NULL);
+
+ if (db == NULL) {
+ return FAILURE;
+ }
+
+ dba = pemalloc(sizeof(*dba), info->flags&DBA_PERSISTENT);
+ dba->dbp = db;
+
+ info->dbf = dba;
+
+ return SUCCESS;
+}
+
+DBA_CLOSE_FUNC(db1)
+{
+ DB1_DATA;
+ dba->dbp->close(dba->dbp);
+ pefree(info->dbf, info->flags&DBA_PERSISTENT);
+}
+
+DBA_FETCH_FUNC(db1)
+{
+ DBT gval;
+ DB1_DATA;
+ DB1_GKEY;
+
+ memset(&gval, 0, sizeof(gval));
+ if (dba->dbp->get(dba->dbp, &gkey, &gval, 0) == RET_SUCCESS) {
+ if (newlen) *newlen = gval.size;
+ return estrndup(gval.data, gval.size);
+ }
+ return NULL;
+}
+
+DBA_UPDATE_FUNC(db1)
+{
+ DBT gval;
+ DB1_DATA;
+ DB1_GKEY;
+
+ gval.data = (char *) val;
+ gval.size = vallen;
+
+ return dba->dbp->put(dba->dbp, &gkey, &gval, mode == 1 ? R_NOOVERWRITE
: 0) != RET_SUCCESS ? FAILURE : SUCCESS;
+}
+
+DBA_EXISTS_FUNC(db1)
+{
+ DBT gval;
+ DB1_DATA;
+ DB1_GKEY;
+
+ return dba->dbp->get(dba->dbp, &gkey, &gval, 0) != RET_SUCCESS ?
FAILURE : SUCCESS;
+}
+
+DBA_DELETE_FUNC(db1)
+{
+ DB1_DATA;
+ DB1_GKEY;
+
+ return dba->dbp->del(dba->dbp, &gkey, 0) != RET_SUCCESS ? FAILURE :
SUCCESS;
+}
+
+DBA_FIRSTKEY_FUNC(db1)
+{
+ DBT gkey;
+ DBT gval;
+ DB1_DATA;
+
+ memset(&gkey, 0, sizeof(gkey));
+ memset(&gval, 0, sizeof(gval));
+
+ if (dba->dbp->seq(dba->dbp, &gkey, &gval, R_FIRST) == RET_SUCCESS) {
+ if (newlen) *newlen = gkey.size;
+ return estrndup(gkey.data, gkey.size);
+ }
+ return NULL;
+}
+
+DBA_NEXTKEY_FUNC(db1)
+{
+ DBT gkey;
+ DBT gval;
+ DB1_DATA;
+
+ memset(&gkey, 0, sizeof(gkey));
+ memset(&gval, 0, sizeof(gval));
+
+ if (dba->dbp->seq(dba->dbp, &gkey, &gval, R_NEXT) == RET_SUCCESS) {
+ if (newlen) *newlen = gkey.size;
+ return estrndup(gkey.data, gkey.size);
+ }
+ return NULL;
+}
+
+DBA_OPTIMIZE_FUNC(db1)
+{
+ /* dummy */
+ return SUCCESS;
+}
+
+DBA_SYNC_FUNC(db1)
+{
+ return SUCCESS;
+}
+
+DBA_INFO_FUNC(db1)
+{
+ return estrdup(DB1_VERSION);
+}
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
