Fixed a couple out-of-memory function-name strings in make_file().
authorWayne Davison <wayned@samba.org>
Sat, 14 Jan 2006 17:19:12 +0000 (17:19 +0000)
committerWayne Davison <wayned@samba.org>
Sat, 14 Jan 2006 17:19:12 +0000 (17:19 +0000)
flist.c

diff --git a/flist.c b/flist.c
index df9988a..65cfe09 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -852,12 +852,11 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 
        alloc_len = file_struct_len + dirname_len + basename_len
            + linkname_len + sum_len;
 
        alloc_len = file_struct_len + dirname_len + basename_len
            + linkname_len + sum_len;
-       if (flist) {
-               bp = pool_alloc(flist->file_pool, alloc_len,
-                   "receive_file_entry");
-       } else {
+       if (flist)
+               bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
+       else {
                if (!(bp = new_array(char, alloc_len)))
                if (!(bp = new_array(char, alloc_len)))
-                       out_of_memory("receive_file_entry");
+                       out_of_memory("make_file");
        }
 
        file = (struct file_struct *)bp;
        }
 
        file = (struct file_struct *)bp;