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

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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) (3 diffs)

kernel/generic/src/console/kconsole.c

@@ -289 +289 @@
                         
                         char tmp[STR_BOUNDS(MAX_CMDLINE)];
-                        wstr_nstr(tmp, current + beg, position - beg + 1);
+                        wstr_to_str(tmp, position - beg + 1, current + beg);
                         
                         int found;
@@ -543 +543 @@
                 if (str_lcmp(hlp->name, cmdline + start,
                     max(str_length(hlp->name),
-                    str_nlength(cmdline + start, (size_t) (end - start) - 1))) == 0) {
+                    str_nlength(cmdline + start, (size_t) (end - start)))) == 0) {
                         cmd = hlp;
                         break;
@@ -665 +665 @@
                 
                 char cmdline[STR_BOUNDS(MAX_CMDLINE)];
-                wstr_nstr(cmdline, tmp, STR_BOUNDS(MAX_CMDLINE));
+                wstr_to_str(cmdline, STR_BOUNDS(MAX_CMDLINE), tmp);
                 
                 if ((!kcon) && (len == 4) && (str_lcmp(cmdline, "exit", 4) == 0))