Changeset 04803bf in mainline for uspace/app/trace/proto.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/app/trace/proto.c (modified) (5 diffs)

uspace/app/trace/proto.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <ipc/ipc.h>
 #include <adt/hash_table.h>
 
@@ -53 +52 @@
 
 typedef struct {
-        ipcarg_t method;
+        sysarg_t method;
         oper_t *oper;
         link_t link;
@@ -157 +156 @@
 }
 
-static void proto_struct_init(proto_t *proto, char *name)
+static void proto_struct_init(proto_t *proto, const char *name)
 {
         proto->name = name;
@@ -164 +163 @@
 }
 
-proto_t *proto_new(char *name)
+proto_t *proto_new(const char *name)
 {
         proto_t *p;
@@ -206 +205 @@
 }
 
-static void oper_struct_init(oper_t *oper, char *name)
+static void oper_struct_init(oper_t *oper, const char *name)
 {
         oper->name = name;
 }
 
-oper_t *oper_new(char *name, int argc, val_type_t *arg_types,
+oper_t *oper_new(const char *name, int argc, val_type_t *arg_types,
     val_type_t rv_type, int respc, val_type_t *resp_types)
 {