Commit d030233d authored by Wayne Davison's avatar Wayne Davison

Get rid of some superfluous empty lines.

parent 35812ea1
......@@ -84,7 +84,6 @@ void init_flist(void)
file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
}
static int show_filelist_p(void)
{
return verbose && xfer_dirs && !am_server;
......@@ -98,20 +97,17 @@ static void start_filelist_progress(char *kind)
rflush(FINFO);
}
static void emit_filelist_progress(int count)
{
rprintf(FINFO, " %d files...\r", count);
}
static void maybe_emit_filelist_progress(int count)
{
if (do_progress && show_filelist_p() && (count % 100) == 0)
emit_filelist_progress(count);
}
static void finish_filelist_progress(const struct file_list *flist)
{
if (do_progress) {
......@@ -127,7 +123,6 @@ void show_flist_stats(void)
/* Nothing yet */
}
static void list_file_entry(struct file_struct *f)
{
char perms[11];
......@@ -155,7 +150,6 @@ static void list_file_entry(struct file_struct *f)
}
}
/**
* Stat either a symlink or its referent, depending on the settings of
* copy_links, copy_unsafe_links, etc.
......@@ -261,7 +255,6 @@ static mode_t from_wire_mode(int mode)
return (mode_t)mode;
}
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len);
......@@ -495,8 +488,6 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
io_write_phase = "unknown";
}
static struct file_struct *receive_file_entry(struct file_list *flist,
unsigned short flags, int f)
{
......@@ -725,7 +716,6 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
return file;
}
/**
* Create a file_struct for a named file by reading its stat()
* information and performing extensive checks against global
......@@ -957,7 +947,6 @@ skip_filters:
return file;
}
static struct file_struct *send_file_name(int f, struct file_list *flist,
char *fname, unsigned short base_flags)
{
......@@ -1001,7 +990,6 @@ static void send_if_directory(int f, struct file_list *flist,
}
}
/* This function is normally called by the sender, but the receiving side also
* calls it from get_dirlist() with f set to -1 so that we just construct the
* file list in memory without sending it over the wire. Also, get_dirlist()
......@@ -1059,7 +1047,6 @@ static void send_directory(int f, struct file_list *flist,
}
}
struct file_list *send_file_list(int f, int argc, char *argv[])
{
int l;
......@@ -1290,7 +1277,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
return flist;
}
struct file_list *recv_file_list(int f)
{
struct file_list *flist;
......@@ -1376,13 +1362,11 @@ oom:
return NULL; /* not reached */
}
static int file_compare(struct file_struct **file1, struct file_struct **file2)
{
return f_name_cmp(*file1, *file2);
}
/* Search for an identically-named item in the file list. Note that the
* items must agree in their directory-ness, or no match is returned. */
int flist_find(struct file_list *flist, struct file_struct *f)
......@@ -1412,7 +1396,6 @@ int flist_find(struct file_list *flist, struct file_struct *f)
return -1;
}
/*
* Free up any resources a file_struct has allocated
* and clear the file.
......@@ -1424,7 +1407,6 @@ void clear_file(int i, struct file_list *flist)
memset(flist->files[i], 0, file_struct_len);
}
/*
* allocate a new file list
*/
......@@ -1464,7 +1446,6 @@ void flist_free(struct file_list *flist)
free(flist);
}
/*
* This routine ensures we don't have any duplicate names in our file list.
* duplicate names can cause corruption because of the pipelining
......@@ -1569,7 +1550,6 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
}
}
static void output_flist(struct file_list *flist)
{
char uidbuf[16], gidbuf[16], depthbuf[16];
......@@ -1598,7 +1578,6 @@ static void output_flist(struct file_list *flist)
}
}
enum fnc_state { s_DIR, s_SLASH, s_BASE, s_TRAILING };
enum fnc_type { t_PATH, t_ITEM };
......@@ -1745,7 +1724,6 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
return dif;
}
/* Return a copy of the full filename of a flist entry, using the indicated
* buffer. No size-checking is done because we checked the size when creating
* the file_struct entry.
......@@ -1765,7 +1743,6 @@ char *f_name_to(struct file_struct *f, char *fbuf)
return fbuf;
}
/* Like f_name_to(), but we rotate through 5 static buffers of our own. */
char *f_name(struct file_struct *f)
{
......@@ -1777,7 +1754,6 @@ char *f_name(struct file_struct *f)
return f_name_to(f, names[n]);
}
/* Do a non-recursive scan of the named directory, possibly ignoring all
* exclude rules except for the daemon's. If "dlen" is >=0, it is the length
* of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment