Changeset f4f866c in mainline for uspace/lib/socket/packet/packet_client.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/socket/packet/packet_client.c (modified) (3 diffs)

uspace/lib/socket/packet/packet_client.c

@@ -156 +156 @@
 packet_t packet_get_copy(int phone, packet_t packet){
         packet_t copy;
-        uint8_t * src;
-        uint8_t * dest;
+        uint8_t * src = NULL;
+        uint8_t * dest = NULL;
         size_t addrlen;
 
@@ -164 +164 @@
         }
         // get a new packet
-        copy = packet_get_4(phone, PACKET_DATA_LENGTH(packet), PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix, PACKET_MIN_SUFFIX(packet));
+        copy = packet_get_4_local(phone, PACKET_DATA_LENGTH(packet), PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix, PACKET_MIN_SUFFIX(packet));
         if(! copy){
                 return NULL;
@@ -178 +178 @@
                 return copy;
         }else{
-                pq_release(phone, copy->packet_id);
+                pq_release_local(phone, copy->packet_id);
                 return NULL;
         }