Changeset f126c87 in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

• kernel/generic/src/console/kconsole.c (modified) (6 diffs)

kernel/generic/src/console/kconsole.c

@@ -166 +166 @@
 const char *cmdtab_enum(const char *name, const char **h, void **ctx)
 {
-        link_t **startpos = (link_t**)ctx;
+        link_t **startpos = (link_t**) ctx;
         size_t namelen = str_length(name);
         
@@ -183 +183 @@
                 if (str_lcmp(curname, name, namelen) == 0) {
                         *startpos = (*startpos)->next;
-                        if (h) {
+                        if (h)
                                 *h = hlp->description;
-                        }
+                        
                         spinlock_unlock(&cmd_lock);
                         return (curname + str_lsize(curname, namelen));
@@ -249 +249 @@
                         
                         if (continue_showing_hints) {
-                                
                                 if (help)
                                         printf("%s%s (%s)\n", name, hint, help);
@@ -292 +291 @@
         while (isspace(cmdline[start]))
                 start++;
+        
         end = start + 1;
+        
         while (!isspace(cmdline[end]))
                 end++;
@@ -374 +375 @@
                                 for (beg = position - 1;
                                     (beg > 0) && (!isspace(current[beg]));
-                                    beg--) {
-                                        ;
-                                }
+                                    beg--);
                                 
                                 if (isspace(current[beg]))
@@ -395 +394 @@
                                         sp = false;
                         }
+                        
                         if (narg && isspace(current[0]))
                                 narg--;
-
+                        
                         int found;
                         if (narg == 0) {