Changeset 8436590 in mainline for uspace/lib/packet/generic/packet_server.c

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (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/lib/packet/generic/packet_server.c (modified) (2 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -112 +112 @@
     size_t max_content, size_t max_suffix)
 {
-        // clear the packet content
+        /* Clear the packet content */
         bzero(((void *) packet) + sizeof(packet_t),
             packet->length - sizeof(packet_t));
         
-        // clear the packet header
+        /* Clear the packet header */
         packet->order = 0;
         packet->metric = 0;
@@ -151 +151 @@
         assert(fibril_mutex_is_locked(&ps_globals.lock));
 
-        // already locked
+        /* Already locked */
         packet = (packet_t *) mmap(NULL, length, PROTO_READ | PROTO_WRITE,
             MAP_SHARED | MAP_ANONYMOUS, 0, 0);