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

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

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

kernel/generic/src/console/kconsole.c

@@ -156 +156 @@
 
 /** Print count times a character */
-NO_TRACE static void print_cc(wchar_t ch, size_t count)
+_NO_TRACE static void print_cc(wchar_t ch, size_t count)
 {
         size_t i;
@@ -203 +203 @@
  *
  */
-NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
+_NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
     hints_enum_func_t hints_enum)
 {
@@ -290 +290 @@
 }
 
-NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
+_NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
 {
         size_t start = 0;
@@ -331 +331 @@
 }
 
-NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
+_NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
     char *tmp)
 {
@@ -548 +548 @@
 }
 
-NO_TRACE static bool parse_int_arg(const char *text, size_t len,
+_NO_TRACE static bool parse_int_arg(const char *text, size_t len,
     sysarg_t *result)
 {
@@ -637 +637 @@
  *
  */
-NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
+_NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
     size_t *start, size_t *end)
 {
@@ -674 +674 @@
  *
  */
-NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
+_NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
 {
         size_t start = 0;