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

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/kconsole.c (modified) (2 diffs)

kernel/generic/src/console/kconsole.c

@@ -224 +224 @@
                 printf("\n");
                 pos = NULL;
-                while ((hint = cmdtab_search_one(name, &pos))) {
+                while (cmdtab_search_one(name, &pos)) {
                         cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
                         printf("%s (%s)\n", hlp->name, hlp->description);
@@ -643 +643 @@
  *
  */
-void kconsole(char *prompt, char *msg, bool kcon)
+void kconsole(const char *prompt, const char *msg, bool kcon)
 {
         if (!stdin) {