From: Marcus Boerger <helly@php.net>
Date: Tue, 12 Nov 2002 12:01:57 +0000 (+0000)
Subject: -fix includes
X-Git-Tag: php-4.3.0RC1~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99beb8034ed51f66971e3a884147630be7e57322;p=php

-fix includes
-fix one missing efree
-replace efree/emalloc with erealloc
---

diff --git a/ext/db/db.c b/ext/db/db.c
index 9baa2ead79..b5ad344a12 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -38,15 +38,9 @@
 #include <unistd.h>
 #endif
 
-#ifdef PHP_31
-#include "os/nt/flock.h"
-#else
-#ifdef PHP_WIN32
-#include "win32/flock.h"
-#else
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
-#endif
 
 #if HAVE_FCNTL_H
 #include <fcntl.h>
@@ -954,7 +948,7 @@ datum flatfile_fetch(FILE *dbf, datum key_datum) {
 			num = atoi(buf);
 			if (num > buf_size) {
 				buf_size+=num;
-				buf = emalloc((buf_size+1)*sizeof(char));
+				buf = erealloc(buf, (buf_size+1)*sizeof(char));
 			}
 			read(fileno(dbf), buf, num);
 			value_datum.dptr = buf;
@@ -985,8 +979,7 @@ int flatfile_delete(FILE *dbf, datum key_datum) {
 		num = atoi(buf);
 		if (num > buf_size) {
 			buf_size += num;
-			if (buf) efree(buf);
-			buf = emalloc((buf_size+1)*sizeof(char));
+			buf = erealloc(buf, (buf_size+1)*sizeof(char));
 		}
 		pos = ftell(dbf);