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

Timestamp:

2010-11-07T21:16:56Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1d0d06a

Parents:

9ce7eb5 (diff), 9ee9d5d (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 from lp:~jakub/helenos/net/.

File:

• uspace/lib/packet/generic/packet_server.c (modified) (3 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -42 +42 @@
 #include <async.h>
 #include <errno.h>
-#include <err.h>
 #include <fibril_synch.h>
 #include <unistd.h>
@@ -162 +161 @@
     size_t max_content, size_t max_suffix)
 {
-        ERROR_DECLARE;
-
         packet_t packet;
+        int rc;
 
         // already locked
@@ -177 +175 @@
         packet_init(packet, addr_len, max_prefix, max_content, max_suffix);
         packet->magic_value = PACKET_MAGIC_VALUE;
-        if (ERROR_OCCURRED(pm_add(packet))) {
+        rc = pm_add(packet);
+        if (rc != EOK) {
                 munmap(packet, packet->length);
                 return NULL;