We now pass the POOL_QALIGN flag to pool_create(). Also optimized
authorWayne Davison <wayned@samba.org>
Sat, 19 Jul 2008 03:46:58 +0000 (20:46 -0700)
committerWayne Davison <wayned@samba.org>
Sat, 19 Jul 2008 03:46:58 +0000 (20:46 -0700)
the verbose-message check at the start of recv_file_list().

flist.c

diff --git a/flist.c b/flist.c
index b3a2653..1c7385c 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -2210,12 +2210,13 @@ struct file_list *recv_file_list(int f)
        int dstart, flags;
        int64 start_read;
 
-       if (!first_flist)
+       if (!first_flist) {
+               if (show_filelist_p())
+                       start_filelist_progress("receiving file list");
+               else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server)
+                       rprintf(FCLIENT, "receiving incremental file list\n");
                rprintf(FLOG, "receiving file list\n");
-       if (show_filelist_p())
-               start_filelist_progress("receiving file list");
-       else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server && !first_flist)
-               rprintf(FCLIENT, "receiving incremental file list\n");
+       }
 
        start_read = stats.total_read;
 
@@ -2430,14 +2431,16 @@ struct file_list *flist_new(int flags, char *msg)
 
        if (flags & FLIST_TEMP) {
                if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0,
-                                               out_of_memory, POOL_INTERN)))
+                                                    out_of_memory,
+                                                    POOL_INTERN|POOL_QALIGN)))
                        out_of_memory(msg);
        } else {
                /* This is a doubly linked list with prev looping back to
                 * the end of the list, but the last next pointer is NULL. */
                if (!first_flist) {
                        flist->file_pool = pool_create(NORMAL_EXTENT, 0,
-                                               out_of_memory, POOL_INTERN);
+                                                      out_of_memory,
+                                                      POOL_INTERN|POOL_QALIGN);
                        if (!flist->file_pool)
                                out_of_memory(msg);