Changeset aca4a04 in mainline

Timestamp:

2012-07-10T12:38:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

550af2b

Parents:

f0d7bd9

Message:

Extract common code into function

Location:

kernel/generic

Files:

• include/console/prompt.h (modified) (1 diff)
• src/console/kconsole.c (modified) (1 diff)
• src/console/prompt.c (modified) (1 diff)
• src/debug/symtab.c (modified) (1 diff)

kernel/generic/include/console/prompt.h

@@ -40 +40 @@
 #define MAX_TAB_HINTS 37
 
+extern bool console_prompt_display_all_hints(indev_t *, size_t);
 extern bool console_prompt_more_hints(indev_t *, size_t *);
 

kernel/generic/src/console/kconsole.c

@@ -231 +231 @@
         /* If possible completions are more than MAX_TAB_HINTS, ask user whether to display them or not. */
         if (found > MAX_TAB_HINTS) {
-                printf("\nDisplay all %zu possibilities? (y or n)", found);
-                wchar_t display;
-                do {
-                        display = indev_pop_character(indev);
-                } while (display != 'y' && display != 'n' && display != 'Y' && display != 'N');
-                continue_showing_hints = (display == 'y') || (display == 'Y');
+                printf("\n");
+                continue_showing_hints = console_prompt_display_all_hints(indev, found);
         }
         

kernel/generic/src/console/prompt.c

@@ -39 +39 @@
 #include <console/prompt.h>
 
+bool console_prompt_display_all_hints(indev_t *indev, size_t hints)
+{
+        printf("Display all %zu possibilities? (y or n)", hints);
+
+        while (true) {
+                wchar_t answer = indev_pop_character(indev);
+
+                if (answer == 'y' || answer == 'Y') {
+                        printf(" y");
+                        return true;
+                }
+
+                if (answer == 'n' || answer == 'N') {
+                        printf(" n");
+                        return false;
+                }
+        }
+}
+
 bool console_prompt_more_hints(indev_t *indev, size_t *display_hints)
 {

kernel/generic/src/debug/symtab.c

@@ -255 +255 @@
         /* If possible completions are more than MAX_TAB_HINTS, ask user whether to display them or not. */
         if (found > MAX_TAB_HINTS) {
-                printf("\nDisplay all %zu possibilities? (y or n)", found);
-                wchar_t display;
-                do {
-                        display = indev_pop_character(indev);
-                } while (display != 'y' && display != 'n' && display != 'Y' && display != 'N');
-                continue_showing_hints = (display == 'y') || (display == 'Y');
+                printf("\n");
+                continue_showing_hints = console_prompt_display_all_hints(indev, found);
         }