]> granicus.if.org Git - php/commitdiff
-fix includes
authorMarcus Boerger <helly@php.net>
Tue, 12 Nov 2002 12:01:57 +0000 (12:01 +0000)
committerMarcus Boerger <helly@php.net>
Tue, 12 Nov 2002 12:01:57 +0000 (12:01 +0000)
-fix one missing efree
-replace efree/emalloc with erealloc

ext/db/db.c

index 9baa2ead79776a13ab4b8ea3cbffc328efd72476..b5ad344a121b7c38dbe89b37aa869ffb7e057f55 100644 (file)
 #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);