cvs: php4 /ext/dbase dbase.c dbf_head.c dbf_head.h
| From: | Jani Taskinen | Date: | Mon, 06 Aug 2001 12:26:55 +0000 |
| Subject: | cvs: php4 /ext/dbase dbase.c dbf_head.c dbf_head.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6599@lists.php.net to get a copy of this message | ||
sniper Mon Aug 6 08:26:55 2001 EDT
Modified files:
/php4/ext/dbase dbase.c dbf_head.c dbf_head.h
Log:
Fix TSRM problem.
Index: php4/ext/dbase/dbase.c
diff -u php4/ext/dbase/dbase.c:1.44 php4/ext/dbase/dbase.c:1.45
--- php4/ext/dbase/dbase.c:1.44 Sat Aug 4 21:42:34 2001
+++ php4/ext/dbase/dbase.c Mon Aug 6 08:26:55 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbase.c,v 1.44 2001/08/05 01:42:34 zeev Exp $ */
+/* $Id: dbase.c,v 1.45 2001/08/06 12:26:55 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -137,7 +137,7 @@
RETURN_FALSE;
}
- dbh = dbf_open(dbf_name->value.str.val, options->value.lval);
+ dbh = dbf_open(dbf_name->value.str.val, options->value.lval TSRMLS_CC);
if (dbh == NULL) {
php_error(E_WARNING, "unable to open database %s", dbf_name->value.str.val);
RETURN_FALSE;
Index: php4/ext/dbase/dbf_head.c
diff -u php4/ext/dbase/dbf_head.c:1.7 php4/ext/dbase/dbf_head.c:1.8
--- php4/ext/dbase/dbf_head.c:1.7 Sat Aug 4 21:42:34 2001
+++ php4/ext/dbase/dbf_head.c Mon Aug 6 08:26:55 2001
@@ -7,8 +7,8 @@
#include <stdio.h>
#include <fcntl.h>
-#include "dbf.h"
#include "php.h"
+#include "dbf.h"
void free_dbf_head(dbhead_t *dbh);
int get_dbf_field(dbhead_t *dbh, dbfield_t *dbf);
@@ -220,7 +220,7 @@
return (char *)strdup(format);
}
-dbhead_t *dbf_open(char *dp, int o_flags)
+dbhead_t *dbf_open(char *dp, int o_flags TSRMLS_DC)
{
int fd;
char *cp;
Index: php4/ext/dbase/dbf_head.h
diff -u php4/ext/dbase/dbf_head.h:1.2 php4/ext/dbase/dbf_head.h:1.3
--- php4/ext/dbase/dbf_head.h:1.2 Fri May 21 06:05:47 1999
+++ php4/ext/dbase/dbf_head.h Mon Aug 6 08:26:55 2001
@@ -1,3 +1,5 @@
+#include "php.h"
+
extern dbhead_t *get_dbf_head(int fd);
void free_dbf_head(dbhead_t *dbh);
extern int put_dbf_head(dbhead_t *dbh);
@@ -5,5 +7,5 @@
extern int put_dbf_field(dbhead_t *dbh, dbfield_t *dbf);
void put_dbf_info(dbhead_t *dbh);
extern char *get_dbf_f_fmt(dbfield_t *dbf);
-extern dbhead_t *dbf_open(char *dp, int o_flags);
+extern dbhead_t *dbf_open(char *dp, int o_flags TSRMLS_DC);
void dbf_head_info(dbhead_t *dbh);