Changeset 72cf064 in mainline for kernel/generic/src/console/prompt.c

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/console/prompt.c (modified) (5 diffs)

kernel/generic/src/console/prompt.c

@@ -43 +43 @@
  * @param indev Where to read characters from.
  * @param hints Number of hints that would be displayed.
+ *
  * @return Whether to print all hints.
+ *
  */
 bool console_prompt_display_all_hints(indev_t *indev, size_t hints)
@@ -49 +51 @@
         ASSERT(indev);
         ASSERT(hints > 0);
-
-        printf("Display all %zu possibilities? (y or n)", 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");
+                
+                if ((answer == 'y') || (answer == 'Y')) {
+                        printf("y");
                         return true;
                 }
-
-                if (answer == 'n' || answer == 'N') {
-                        printf(" n");
+                
+                if ((answer == 'n') || (answer == 'N')) {
+                        printf("n");
                         return false;
                 }
@@ -71 +73 @@
  * When the function returns false, @p display_hints is set to zero.
  *
- * @param[in] indev Where to read characters from.
+ * @param[in]  indev         Where to read characters from.
  * @param[out] display_hints How many hints to display.
+ *
  * @return Whether to display more hints.
+ *
  */
 bool console_prompt_more_hints(indev_t *indev, size_t *display_hints)
@@ -79 +83 @@
         ASSERT(indev);
         ASSERT(display_hints != NULL);
-
+        
         printf("--More--");
         while (true) {
                 wchar_t continue_showing_hints = indev_pop_character(indev);
                 /* Display a full page again? */
-                if (continue_showing_hints == 'y'
-                    || continue_showing_hints == 'Y'
-                    || continue_showing_hints == ' ') {
+                if ((continue_showing_hints == 'y') ||
+                    (continue_showing_hints == 'Y') ||
+                    (continue_showing_hints == ' ')) {
                         *display_hints = MAX_TAB_HINTS - 1;
                         break;
                 }
-
+                
                 /* Stop displaying hints? */
-                if (continue_showing_hints == 'n'
-                    || continue_showing_hints == 'N'
-                    || continue_showing_hints == 'q'
-                    || continue_showing_hints == 'Q') {
+                if ((continue_showing_hints == 'n') ||
+                    (continue_showing_hints == 'N') ||
+                    (continue_showing_hints == 'q') ||
+                    (continue_showing_hints == 'Q')) {
                         *display_hints = 0;
                         break;
                 }
-
+                
                 /* Show one more hint? */
                 if (continue_showing_hints == '\n') {
@@ -106 +110 @@
                 }
         }
-
+        
         /* Delete the --More-- option */
         printf("\r         \r");
-
+        
         return *display_hints > 0;
 }