Changeset dff89818c3b64eff6f31f04dcef240c5a9daff4c for com32/hdt/hdt-cli-hdt.c

Timestamp:

11/01/09 12:05:07 (3 years ago)

Author:

Erwan Velu <erwan.velu@…>

Children:

079f92a31281573b8a7b152b1730e7a349ac6365

Parents:

a7f6dd2b9fc3f8ad29a05135c99288156961329b

git-author:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-10-31T22:32:26Z-0700

git-committer:

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

Message:

hdt: change remaining printf to more_printf (CLI)

A lot of places still had printf() instead of more_printf().
This patch does a bulk update and add missing reset_more_printf(),
used to reset the pager counter between each command call.

This also changes the more_printf() routine to delete the "--More--"
line while scrolling.

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

Files:

• com32/hdt/hdt-cli-hdt.c (modified) (9 diffs)

com32/hdt/hdt-cli-hdt.c

@@ -53 +53 @@
         int i = 0;
 
-        printf("Available modes:\n");
+    reset_more_printf();
+        more_printf("Available modes:\n");
         while (list_modes[i]) {
-                printf("%s ", list_modes[i]->name);
+                more_printf("%s ", list_modes[i]->name);
                 i++;
         }
-        printf("\n");
+        more_printf("\n");
 }
 
@@ -71 +72 @@
         cli_mode_t new_mode;
 
+    reset_more_printf();
         if (argc <= 0) {
-                printf("Which mode?\n");
+                more_printf("Which mode?\n");
                 return;
         }
@@ -118 +120 @@
         find_cli_mode_descr(hdt_cli.mode, &current_mode);
 
-        printf("Available commands are:\n");
+    reset_more_printf();
+        more_printf("Available commands are:\n");
 
         /* List first default modules of the mode */
@@ -124 +127 @@
             current_mode->default_modules->modules) {
                 while (current_mode->default_modules->modules[j].name) {
-                        printf("%s ",
+                        more_printf("%s ",
                                current_mode->default_modules->modules[j].name);
                         j++;
                 }
-                printf("\n");
+                more_printf("\n");
         }
 
@@ -134 +137 @@
         if (current_mode->show_modules &&
             current_mode->show_modules->modules) {
-                printf("\nshow commands:\n");
+                more_printf("\nshow commands:\n");
                 j = 0;
                 while (current_mode->show_modules->modules[j].name) {
-                        printf("%s ",
+                        more_printf("%s ",
                                current_mode->show_modules->modules[j].name);
                         j++;
                 }
-                printf("\n");
+                more_printf("\n");
         }
 
@@ -147 +150 @@
         if (current_mode->set_modules &&
             current_mode->set_modules->modules) {
-                printf("\nset commands:\n");
+                more_printf("\nset commands:\n");
                 j = 0;
                 while (current_mode->set_modules->modules[j].name) {
-                        printf("%s ",
+                        more_printf("%s ",
                                current_mode->set_modules->modules[j].name);
                         j++;
                 }
-                printf("\n");
+                more_printf("\n");
         }
 
@@ -174 +177 @@
                                              &associated_module);
                         if (associated_module == NULL)
-                                printf("%s ",
+                                more_printf("%s ",
                                        hdt_mode.default_modules->modules[j].name);
                         j++;
                 }
-                printf("\n");
-        }
-
-        printf("\n");
+                more_printf("\n");
+        }
+
+        more_printf("\n");
         main_show_modes(argc, argv, hardware);
 }
@@ -207 +210 @@
         detect_dmi(hardware);
         cpu_detect(hardware);
+    reset_more_printf();
         clear_screen();
         main_show_cpu(argc, argv, hardware);
@@ -237 +241 @@
                    struct s_hardware *hardware __unused)
 {
-        printf("HDT\n");
-        printf(" Product     : %s\n", PRODUCT_NAME);
-        printf(" Version     : %s\n", VERSION);
-        printf(" Author      : %s\n", AUTHOR);
-        printf(" Contact     : %s\n", CONTACT);
+    reset_more_printf();
+        more_printf("HDT\n");
+        more_printf(" Product     : %s\n", PRODUCT_NAME);
+        more_printf(" Version     : %s\n", VERSION);
+        more_printf(" Author      : %s\n", AUTHOR);
+        more_printf(" Contact     : %s\n", CONTACT);
         char *contributors[NB_CONTRIBUTORS] = CONTRIBUTORS;
         for (int c = 0; c < NB_CONTRIBUTORS; c++) {
-                printf(" Contributor : %s\n", contributors[c]);
+                more_printf(" Contributor : %s\n", contributors[c]);
         }
 }