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

Timestamp:

2010-09-19T13:33:47Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a786f9

Parents:

5203efb1 (diff), 7c8267b (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:

Marge from lp:~jakub/helenos/net.

File:

• uspace/lib/socket/packet/packet_client.c (modified) (1 diff)

uspace/lib/socket/packet/packet_client.c

@@ -122 +122 @@
 }
 
-int packet_set_addr(packet_t packet, const uint8_t * src, const uint8_t * dest, size_t addr_len){
+int
+packet_set_addr(packet_t packet, const uint8_t * src, const uint8_t * dest,
+    size_t addr_len)
+{
         size_t padding;
         size_t allocated;
 
-        if(! packet_is_valid(packet)){
+        if (!packet_is_valid(packet))
                 return EINVAL;
-        }
+
         allocated = PACKET_MAX_ADDRESS_LENGTH(packet);
-        if(allocated < addr_len){
+        if (allocated < addr_len)
                 return ENOMEM;
-        }
+
         padding = allocated - addr_len;
         packet->addr_len = addr_len;
-        if(src){
+
+        if (src) {
                 memcpy((void *) packet + packet->src_addr, src, addr_len);
-                if(padding){
-                        bzero((void *) packet + packet->src_addr + addr_len, padding);
-                }
-        }else{
+                if (padding)
+                        bzero((void *) packet + packet->src_addr + addr_len,
+                            padding);
+        } else {
                 bzero((void *) packet + packet->src_addr, allocated);
         }
-        if(dest){
+
+        if (dest) {
                 memcpy((void *) packet + packet->dest_addr, dest, addr_len);
-                if(padding){
-                        bzero((void *) packet + packet->dest_addr + addr_len, padding);
-                }
-        }else{
+                if (padding)
+                        bzero((void *) packet + packet->dest_addr + addr_len,
+                            padding);
+        } else {
                 bzero((void *) packet + packet->dest_addr, allocated);
         }
+
         return EOK;
 }