Changeset 8436590 in mainline for uspace/app/trace/trace.c

Timestamp:

2011-04-07T21:38:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285a (diff), ccca251 (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.

File:

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

uspace/app/trace/trace.c

@@ -53 +53 @@
 #include <libc.h>
 
-// Temporary: service and method names
+/* Temporary: service and method names */
 #include "proto.h"
 #include <ipc/services.h>
@@ -872 +872 @@
 static display_mask_t parse_display_mask(const char *text)
 {
-        display_mask_t dm;
+        display_mask_t dm = 0;
         const char *c = text;