From: Matt McCutchen <matt@mattmccutchen.net>
Date: Wed, 17 Mar 2010 05:03:32 +0000 (-0400)
Subject: Minor restructuring/clarification to get_backup_name.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/0b8a9bd69d1e4003bdadb663581533681adba808

Minor restructuring/clarification to get_backup_name.
(Tweaked by Wayne to follow his preferred style.)
---

diff --git a/backup.c b/backup.c
index 0ef4d9ec..6dbc17a0 100644
--- 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;
 }