Changeset 25eec4e in mainline for uspace/app/trace/ipcp.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• uspace/app/trace/ipcp.c (modified) (2 diffs)

uspace/app/trace/ipcp.c

@@ -140 +140 @@
 void ipcp_init(void)
 {
-        ipc_m_desc_t *desc;
-        oper_t *oper;
-
         val_type_t arg_def[OPER_MAX_ARGS] = {
                 V_INTEGER,
@@ -162 +159 @@
         proto_system = proto_new("system");
 
-        desc = ipc_methods;
-        while (desc->number != 0) {
-                oper = oper_new(desc->name, OPER_MAX_ARGS, arg_def, V_INTEGER,
-                        OPER_MAX_ARGS, arg_def);
-                proto_add_oper(proto_system, desc->number, oper);
-
-                ++desc;
+        for (size_t i = 0; i < ipc_methods_len; i++) {
+                oper_t *oper = oper_new(ipc_methods[i].name, OPER_MAX_ARGS,
+                    arg_def, V_INTEGER, OPER_MAX_ARGS, arg_def);
+                proto_add_oper(proto_system, ipc_methods[i].number, oper);
         }