Export print_word_wrapped

... and use the word wrapping API to print long strings.

Signed-off-by: Keith Busch <keith.busch@intel.com>

diff --git a/nvme.c b/nvme.c
index c10f2181707039a18b46af2b35d7accabecb7164..4eb210eed4959a59ffc607469d85e90d927d1e63 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -2483,13 +2483,12 @@ static void command_help(const char *cmd)
 static void general_help()
 {
        unsigned i;
+       const char *desc =  "'<device>' may be either an NVMe character device (ex: /dev/nvme0) or an nvme block device (ex: /dev/nvme0n1).\n\n";
 
        printf("%s\n", nvme_version_string);
        usage("nvme");
        printf("\n");
-       printf("'<device>' / '/dev/nvmeX' may be either an NVMe character "\
-              "device (ex: /dev/nvme0)\n or an nvme block device (ex: /d"\
-              "ev/nvme0n1)\n\n");
+       print_word_wrapped(desc, 0, 0);
        printf("The following are all implemented sub-commands:\n");
        for (i = 0; i < NUM_COMMANDS; i++)
                printf("  %-*s %s\n", 15, commands[i].name, commands[i].help);

diff --git a/src/argconfig.c b/src/argconfig.c
index fbbb00cc03ce0ce7d31b4c552a1da35d12812885..8d6d1ba41aea938aeeb47ef005bdb5794b48b147 100644 (file)
--- a/src/argconfig.c
+++ b/src/argconfig.c
@@ -51,7 +51,7 @@ void argconfig_append_usage(const char *str)
        append_usage_str = str;
 }
 
-static void print_word_wrapped(const char *s, int indent, int start)
+void print_word_wrapped(const char *s, int indent, int start)
 {
        const int width = 76;
        const char *c, *t;

diff --git a/src/argconfig.h b/src/argconfig.h
index 7d2888e617f3bb8d1e2807e99a5d066117f4994c..9eacc1ff295a75420d206a5cc32cfdd007c20e02 100644 (file)
--- a/src/argconfig.h
+++ b/src/argconfig.h
@@ -112,7 +112,7 @@ int argconfig_set_subopt(const char *opt,
 int argconfig_get_subopt(const char *opt,
                         const struct argconfig_sub_options *options,
                         void *config_out, va_list arg);
-
+void print_word_wrapped(const char *s, int indent, int start);
 #ifdef __cplusplus
 }
 #endif