Changeset 95c675b in mainline for kernel/generic/src/console/prompt.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

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

kernel/generic/src/console/prompt.c

@@ -37 +37 @@
  */
 
+#include <assert.h>
 #include <console/prompt.h>
 
@@ -49 +50 @@
 bool console_prompt_display_all_hints(indev_t *indev, size_t hints)
 {
-        ASSERT(indev);
-        ASSERT(hints > 0);
+        assert(indev);
+        assert(hints > 0);
         
         printf("Display all %zu possibilities? (y or n) ", hints);
@@ -81 +82 @@
 bool console_prompt_more_hints(indev_t *indev, size_t *display_hints)
 {
-        ASSERT(indev);
-        ASSERT(display_hints != NULL);
+        assert(indev);
+        assert(display_hints != NULL);
         
         printf("--More--");