]> git.proxmox.com Git - mirror_zfs.git/commitdiff
libzfs_sendrecv: Style pass on send_print_verbose
authorRyan Moeller <freqlabs@FreeBSD.org>
Thu, 12 Aug 2021 16:50:50 +0000 (16:50 +0000)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 2 Feb 2022 01:03:13 +0000 (17:03 -0800)
* Add missing dgettext calls.
* Avoid unnecessary line wraps.
* Factor out duplicated parsable check.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes #12967

lib/libzfs/libzfs_sendrecv.c

index c9c5d69758687aa30206f8685585167baa928280..d3b2b56ad2ba351148de0ac8e7ea4cc5aee6a615 100644 (file)
@@ -964,39 +964,33 @@ send_print_verbose(FILE *fout, const char *tosnap, const char *fromsnap,
 {
        if (parsable) {
                if (fromsnap != NULL) {
-                       (void) fprintf(fout, "incremental\t%s\t%s",
-                           fromsnap, tosnap);
+                       (void) fprintf(fout, dgettext(TEXT_DOMAIN,
+                           "incremental\t%s\t%s"), fromsnap, tosnap);
                } else {
-                       (void) fprintf(fout, "full\t%s",
-                           tosnap);
+                       (void) fprintf(fout, dgettext(TEXT_DOMAIN,
+                           "full\t%s"), tosnap);
                }
+               (void) fprintf(fout, "\t%llu", (longlong_t)size);
        } else {
                if (fromsnap != NULL) {
                        if (strchr(fromsnap, '@') == NULL &&
                            strchr(fromsnap, '#') == NULL) {
                                (void) fprintf(fout, dgettext(TEXT_DOMAIN,
-                                   "send from @%s to %s"),
-                                   fromsnap, tosnap);
+                                   "send from @%s to %s"), fromsnap, tosnap);
                        } else {
                                (void) fprintf(fout, dgettext(TEXT_DOMAIN,
-                                   "send from %s to %s"),
-                                   fromsnap, tosnap);
+                                   "send from %s to %s"), fromsnap, tosnap);
                        }
                } else {
                        (void) fprintf(fout, dgettext(TEXT_DOMAIN,
-                           "full send of %s"),
-                           tosnap);
+                           "full send of %s"), tosnap);
+               }
+               if (size != 0) {
+                       char buf[16];
+                       zfs_nicebytes(size, buf, sizeof (buf));
+                       (void) fprintf(fout, dgettext(TEXT_DOMAIN,
+                           " estimated size is %s"), buf);
                }
-       }
-
-       if (parsable) {
-               (void) fprintf(fout, "\t%llu",
-                   (longlong_t)size);
-       } else if (size != 0) {
-               char buf[16];
-               zfs_nicebytes(size, buf, sizeof (buf));
-               (void) fprintf(fout, dgettext(TEXT_DOMAIN,
-                   " estimated size is %s"), buf);
        }
        (void) fprintf(fout, "\n");
 }