From: Arvin Schnell Date: Fri, 3 Jan 2020 16:03:38 +0000 (+0100) Subject: - renamed variable for consistency X-Git-Tag: v0.8.8~1^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F516%2Fhead;p=thirdparty%2Fsnapper.git - renamed variable for consistency --- diff --git a/client/snapper.cc b/client/snapper.cc index 515096dd..fa76d37c 100644 --- a/client/snapper.cc +++ b/client/snapper.cc @@ -1014,13 +1014,13 @@ command_rollback(cli::GlobalOptions* global_options, ProxySnappers* snappers, Pr exit(EXIT_FAILURE); } - const string default_description = "rollback backup"; + const string default_description1 = "rollback backup"; const string default_description2 = "writable copy"; bool print_number = false; SCD scd1; - scd1.description = default_description; + scd1.description = default_description1; scd1.cleanup = "number"; scd1.userdata["important"] = "yes"; @@ -1065,7 +1065,7 @@ command_rollback(cli::GlobalOptions* global_options, ProxySnappers* snappers, Pr ProxySnapshots::iterator previous_default = snapshots.getDefault(); - if (previous_default != snapshots.end() && scd1.description == default_description) + if (previous_default != snapshots.end() && scd1.description == default_description1) scd1.description += sformat(" of #%d", previous_default->getNum()); ProxySnapshots::const_iterator snapshot1 = snapshots.end();