X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d619ff1376cf0a55ff2fa0a6baa776f22cac5139..794a0b6c25375ff6fcfb35700b0511334d31e9c8:/options.c diff --git a/options.c b/options.c index 3c5ecb5e..0abf6ced 100644 --- a/options.c +++ b/options.c @@ -117,7 +117,6 @@ int inplace = 0; int delay_updates = 0; long block_size = 0; /* "long" because popt can't set an int32. */ - /** Network address family. **/ #ifdef INET6 int default_af_hint = 0; /* Any protocol */ @@ -1661,11 +1660,11 @@ void server_options(char **args,int *argc) args[ac++] = "--delete"; if (delete_before > 1) args[ac++] = "--delete-before"; - if (delete_during) { - args[ac++] = delete_during == 2 ? "--delete-delay" - : "--delete-during"; - } - if (delete_after) + else if (delete_during == 2) + args[ac++] = "--delete-delay"; + else if (delete_during) + args[ac++] = "--delete-during"; + else if (delete_after) args[ac++] = "--delete-after"; if (force_delete) args[ac++] = "--force";