Changeset b77ce84 in mainline for uspace/app

Timestamp:

2011-04-13T17:27:52Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

34e8bab, a0a134b

Parents:

8b4ce802 (diff), 17279ead (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

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (2 diffs)
• trace/trace.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -195 +195 @@
                                         wchar_t c = str_decode(buff, &offset, bytes);
                                         if (c == 0) {
-                                                // reached end of string
+                                                /* Reached end of string */
                                                 break;
                                         }
@@ -228 +228 @@
         int rc;
         
-        // reset global state
-        // TODO: move to structure?
+        /*
+         * reset global state
+         * TODO: move to structure?
+         */
         paging_enabled = false;
         chars_remaining = 0;

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>