Changeset ab936440 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2019-02-12T20:42:42Z (6 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/sysinfo/sysinfo.c (modified) (10 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -62 +62 @@
  *
  */
-NO_TRACE static errno_t sysinfo_item_constructor(void *obj, unsigned int kmflag)
+_NO_TRACE static errno_t sysinfo_item_constructor(void *obj, unsigned int kmflag)
 {
         sysinfo_item_t *item = (sysinfo_item_t *) obj;
@@ -82 +82 @@
  *
  */
-NO_TRACE static size_t sysinfo_item_destructor(void *obj)
+_NO_TRACE static size_t sysinfo_item_destructor(void *obj)
 {
         sysinfo_item_t *item = (sysinfo_item_t *) obj;
@@ -124 +124 @@
  *
  */
-NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
+_NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
     sysinfo_item_t *subtree, sysinfo_return_t **ret, bool dry_run)
 {
@@ -190 +190 @@
  *
  */
-NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
+_NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
     sysinfo_item_t **psubtree)
 {
@@ -508 +508 @@
  *
  */
-NO_TRACE static void sysinfo_indent(size_t spaces)
+_NO_TRACE static void sysinfo_indent(size_t spaces)
 {
         for (size_t i = 0; i < spaces; i++)
@@ -522 +522 @@
  *
  */
-NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
+_NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
 {
         /* Walk all siblings */
@@ -622 +622 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
+_NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
     sysinfo_item_t **root, bool dry_run)
 {
@@ -677 +677 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
     bool dry_run)
 {
@@ -720 +720 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_keys(const char *name,
+_NO_TRACE static sysinfo_return_t sysinfo_get_keys(const char *name,
     sysinfo_item_t **root, bool dry_run)
 {
@@ -786 +786 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
     bool dry_run)
 {