Changeset 0c2d9bb in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/cmd.c (modified) (3 diffs)

kernel/generic/src/console/cmd.c

@@ -656 +656 @@
         
         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)
@@ -672 +669 @@
         }
         
-        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 +906 @@
         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);