summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-06-28 03:19:20 +0000
committerAndrew Tridgell <tridge@samba.org>2002-06-28 03:19:20 +0000
commit98a119ee58286b708a54dcba9ffcfbdcf8cb6bba (patch)
tree8a820c57d40b266c6d15d195e8edef1fe5f3c220
parent57101ef770e34ef9fd2ddcb5d9c9e9ad050e5e3d (diff)
downloadsamba-98a119ee58286b708a54dcba9ffcfbdcf8cb6bba.tar.gz
samba-98a119ee58286b708a54dcba9ffcfbdcf8cb6bba.tar.xz
samba-98a119ee58286b708a54dcba9ffcfbdcf8cb6bba.zip
don't warn on non-existant files in map_file(), let the caller handle any warning
-rw-r--r--source/lib/util_file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/lib/util_file.c b/source/lib/util_file.c
index 90cb022f587..611e0e40be9 100644
--- a/source/lib/util_file.c
+++ b/source/lib/util_file.c
@@ -450,7 +450,8 @@ void *map_file(char *fname, size_t size)
#endif
if (!p) {
p = file_load(fname, &s2);
- if (!p || (s2 != 0 && s2 != size)) {
+ if (!p) return NULL;
+ if (s2 != size) {
DEBUG(1,("incorrect size for %s - got %d expected %d\n",
fname, s2, size));
if (p) free(p);