Got rid of /* dw */ comments.
authorWayne Davison <wayned@samba.org>
Fri, 2 Jan 2004 07:42:20 +0000 (07:42 +0000)
committerWayne Davison <wayned@samba.org>
Fri, 2 Jan 2004 07:42:20 +0000 (07:42 +0000)
flist.c
main.c
match.c
sender.c

diff --git a/flist.c b/flist.c
index d50a947..efb9d44 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -816,7 +816,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 
        flist_expand(flist);
 
-       if (write_batch)        /*  dw  */
+       if (write_batch)
                file->flags = FLAG_DELETE;
 
        if (file->basename[0]) {
@@ -1081,7 +1081,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                io_end_buffering();
                stats.flist_size = stats.total_written - start_write;
                stats.num_files = flist->count;
-               if (write_batch)        /*  dw  */
+               if (write_batch)
                        write_batch_flist_info(flist->count, flist->files);
        }
 
diff --git a/main.c b/main.c
index 5b3493c..1b0cd8b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -385,8 +385,8 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        report(f_out);
        if (protocol_version >= 24) {
                /* final goodbye message */
-               read_int(f_in);
-       }
+               read_int(f_in);
+       }
        io_flush();
        exit_cleanup(0);
 }
@@ -612,7 +612,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                        send_exclude_list(f_out);
                if (remote_filesfrom_file)
                        filesfrom_fd = f_in;
-               if (!read_batch) /*  dw -- don't write to pipe */
+               if (!read_batch) /* don't write to pipe */
                        flist = send_file_list(f_out,argc,argv);
                if (verbose > 3)
                        rprintf(FINFO,"file list sent\n");
diff --git a/match.c b/match.c
index ba56978..dd5ac47 100644 (file)
--- a/match.c
+++ b/match.c
@@ -284,7 +284,7 @@ static void hash_search(int f,struct sum_struct *s,
 void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 {
        char file_sum[MD4_SUM_LENGTH];
-       extern int write_batch;  /*  dw */
+       extern int write_batch;
 
        last_match = 0;
        false_alarms = 0;
@@ -319,7 +319,7 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
        if (verbose > 2)
                rprintf(FINFO,"sending file_sum\n");
        write_buf(f,file_sum,MD4_SUM_LENGTH);
-       if (write_batch) /* dw */
+       if (write_batch)
                write_batch_delta_file(file_sum, MD4_SUM_LENGTH);
 
        if (targets) {
index 22d67ab..027dfea 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -120,13 +120,13 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        int phase = 0;
        extern struct stats stats;
        struct stats initial_stats;
-       extern int write_batch;   /* dw */
-       extern int read_batch;    /* dw */
-       int checksums_match;   /* dw */
-       int buff_len;  /* dw */
-       char buff[CHUNK_SIZE];    /* dw */
-       int j;   /* dw */
-       int done;   /* dw */
+       extern int write_batch;
+       extern int read_batch;
+       int checksums_match;
+       int buff_len;
+       char buff[CHUNK_SIZE];
+       int j;
+       int done;
 
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
@@ -201,7 +201,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                if (errno == ENOENT) {
                                        io_error |= IOERR_VANISHED;
                                        rprintf(FINFO, "file has vanished: %s\n",
-                                               full_fname(fname));
+                                               full_fname(fname));
                                } else {
                                        io_error |= IOERR_GENERAL;
                                        rprintf(FERROR, "send_files failed to open %s: %s\n",
@@ -247,7 +247,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                set_compression(fname);
 
-               if (read_batch) { /* dw */
+               if (read_batch) {
                        /* read checksums originally computed on sender side */
                        read_batch_csum_info(i, s, &checksums_match);
                        if (checksums_match) {
@@ -288,7 +288,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        log_send(file, &initial_stats);
                }
 
-               if (!read_batch) { /* dw */
+               if (!read_batch) {
                        if (buf) {
                                j = unmap_file(buf);
                                if (j) {
@@ -313,7 +313,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        match_report();
 
        write_int(f_out, -1);
-       if (write_batch || read_batch) { /* dw */
+       if (write_batch || read_batch) {
                close_batch_csums_file();
                close_batch_delta_file();
        }