Changeset 5869ce0 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2012-03-01T23:22:32Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0030eef

Parents:

3d23553

Message:

extend sysinfo generated subtree interface

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (3 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -151 +151 @@
                         case SYSINFO_SUBTREE_FUNCTION:
                                 /* Get generated data */
-                                **ret = cur->subtree.get_data(name + i + 1, dry_run);
+                                **ret = cur->subtree.generator.fn(name + i + 1, dry_run,
+                                    cur->subtree.generator.data);
                                 return NULL;
                         default:
@@ -431 +432 @@
  *             a new root item (NULL for global sysinfo root).
  * @param fn   Subtree generator function.
+ * @param data Private data to be passed to the generator.
  *
  */
 void sysinfo_set_subtree_fn(const char *name, sysinfo_item_t **root,
-    sysinfo_fn_subtree_t fn)
+    sysinfo_fn_subtree_t fn, void *data)
 {
         /* Protect sysinfo tree consistency */
@@ -448 +450 @@
         if ((item != NULL) && (item->subtree_type != SYSINFO_SUBTREE_TABLE)) {
                 item->subtree_type = SYSINFO_SUBTREE_FUNCTION;
-                item->subtree.get_data = fn;
+                item->subtree.generator.fn = fn;
+                item->subtree.generator.data = data;
         }