Minor restructuring/clarification to get_backup_name.

[rsync.git] / backup.c

diff --git a/backup.c b/backup.c
index 0ef4d9ec148455b675dcb78e4530673e9e362d7c..6dbc17a0a617b22b841bdec942c6fb8712f6bf4c 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -160,13 +160,13 @@ char *get_backup_name(const char *fname)
                /* copy fname into backup_dir_buf while validating the dirs. */
                if (copy_valid_path(fname))
                        return backup_dir_buf;
+               /* copy_valid_path() has printed an error message. */
                return NULL;
-       } else {
-               if (stringjoin(backup_dir_buf, MAXPATHLEN,
-                              fname, backup_suffix, NULL) < MAXPATHLEN)
-                       return backup_dir_buf;
        }
 
+       if (stringjoin(backup_dir_buf, MAXPATHLEN, fname, backup_suffix, NULL) < MAXPATHLEN)
+               return backup_dir_buf;
+
        rprintf(FERROR, "backup filename too long\n");
        return NULL;
 }