Changeset 079f92a31281573b8a7b152b1730e7a349ac6365

Timestamp:

11/01/09 12:06:00 (2 years ago)

Author:

Erwan Velu <erwan.velu@…>

Children:

c2f4ec7d2a22c57853b6616d4ab49d79c6744d25

Parents:

dff89818c3b64eff6f31f04dcef240c5a9daff4c

git-author:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-11-01T00:12:16Z-0700

git-committer:

Erwan Velu <erwan.velu@free.fr> / 2009-11-01T13:06:00Z+0100

Message:

hdt: use plain printf for help, not more_printf (CLI)

The help prints several elements on the same line. This can't
work with more_printf() as the macro assumes each call contains
one and only one \n.

Signed-off-by: Pierre-Alexandre Meyer <pierre@…>

Location:

com32/hdt

Files:

• hdt-cli-hdt.c (modified) (6 diffs)
• hdt-common.h (modified) (2 diffs)

com32/hdt/hdt-cli-hdt.c

@@ -54 +54 @@
 
     reset_more_printf();
-        more_printf("Available modes:\n");
+        printf("Available modes:\n");
         while (list_modes[i]) {
-                more_printf("%s ", list_modes[i]->name);
+                printf("%s ", list_modes[i]->name);
                 i++;
         }
-        more_printf("\n");
+        printf("\n");
 }
 
@@ -120 +120 @@
         find_cli_mode_descr(hdt_cli.mode, &current_mode);
 
-    reset_more_printf();
-        more_printf("Available commands are:\n");
+        printf("Available commands are:\n");
 
         /* List first default modules of the mode */
@@ -127 +126 @@
             current_mode->default_modules->modules) {
                 while (current_mode->default_modules->modules[j].name) {
-                        more_printf("%s ",
+                        printf("%s ",
                                current_mode->default_modules->modules[j].name);
                         j++;
                 }
-                more_printf("\n");
+                printf("\n");
         }
 
@@ -137 +136 @@
         if (current_mode->show_modules &&
             current_mode->show_modules->modules) {
-                more_printf("\nshow commands:\n");
+                printf("\nshow commands:\n");
                 j = 0;
                 while (current_mode->show_modules->modules[j].name) {
-                        more_printf("%s ",
+                        printf("%s ",
                                current_mode->show_modules->modules[j].name);
                         j++;
                 }
-                more_printf("\n");
+                printf("\n");
         }
 
@@ -150 +149 @@
         if (current_mode->set_modules &&
             current_mode->set_modules->modules) {
-                more_printf("\nset commands:\n");
+                printf("\nset commands:\n");
                 j = 0;
                 while (current_mode->set_modules->modules[j].name) {
-                        more_printf("%s ",
+                        printf("%s ",
                                current_mode->set_modules->modules[j].name);
                         j++;
                 }
-                more_printf("\n");
+                printf("\n");
         }
 
@@ -177 +176 @@
                                              &associated_module);
                         if (associated_module == NULL)
-                                more_printf("%s ",
+                                printf("%s ",
                                        hdt_mode.default_modules->modules[j].name);
                         j++;
                 }
-                more_printf("\n");
-        }
-
-        more_printf("\n");
+                printf("\n");
+        }
+
+        printf("\n");
         main_show_modes(argc, argv, hardware);
 }

com32/hdt/hdt-common.h

@@ -66 +66 @@
 } while (0);
 
+/* The brokeness of that macro is that
+ * it assumes that __VA_ARGS__ contains
+ * one \n (and only one)
+ */
 #define more_printf(...) do {\
  if (display_line_nb == 20) {\
@@ -74 +78 @@
  }\
  printf(__VA_ARGS__);\
- display_line_nb++; \
+ display_line_nb++;\
 } while (0);