Changes in kernel/generic/src/console/cmd.c [2f33fbc:593e023] in mainline

File:

• kernel/generic/src/console/cmd.c (modified) (7 diffs)

kernel/generic/src/console/cmd.c

@@ -45 +45 @@
 #include <console/kconsole.h>
 #include <print.h>
+#include <log.h>
 #include <panic.h>
 #include <typedefs.h>
@@ -639 +640 @@
         for (i = 0; basic_commands[i]; i++) {
                 if (!cmd_register(basic_commands[i])) {
-                        printf("Cannot register command %s\n",
+                        log(LF_OTHER, LVL_ERROR,
+                            "Cannot register command %s",
                             basic_commands[i]->name);
                 }
@@ -656 +658 @@
         
         size_t len = 0;
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp;
-                hlp = list_get_instance(cur, cmd_info_t, link);
-                
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
                 if (str_length(hlp->name) > len)
@@ -668 +667 @@
         unsigned int _len = (unsigned int) len;
         if ((_len != len) || (((int) _len) < 0)) {
-                printf("Command length overflow\n");
+                log(LF_OTHER, LVL_ERROR, "Command length overflow");
                 return 1;
         }
         
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp;
-                hlp = list_get_instance(cur, cmd_info_t, link);
-                
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
                 printf("%-*s %s\n", _len, hlp->name, hlp->description);
@@ -912 +908 @@
         spinlock_lock(&cmd_lock);
         
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp;
-                
-                hlp = list_get_instance(cur, cmd_info_t, link);
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
                 
@@ -1156 +1149 @@
 int cmd_set4(cmd_arg_t *argv)
 {
-        uintptr_t addr;
+        uintptr_t addr = 0; // Prevent -Werror=maybe-uninitialized
         uint32_t arg1 = argv[1].intval;
         bool pointer = false;
@@ -1364 +1357 @@
         printf("The kernel will now relinquish the console.\n");
         release_console();
-        
-        event_notify_0(EVENT_KCONSOLE, false);
         indev_pop_character(stdin);