Changeset 7c8267b in mainline for uspace/lib

Timestamp:

2010-09-19T12:55:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2fa0ad9, dc94cb2

Parents:

553f430

Message:

Coding style fixes.

This changeset converts the entire TCP code into HelenOS cstyle and improves
its general legibility by adding vertical spacing and removing unnecessary
clutter. It also attempts to suppress too deep nesting of blocks by
functional-equivalent code restructuralization.

This changeset brings no change in functionality (hopefully), but it should make
it easier to understand and eventually fix TCP code.

Location:

uspace/lib

Files:

• net/generic/packet_remote.c (modified) (1 diff)
• net/tl/tl_common.c (modified) (1 diff)
• socket/packet/packet_client.c (modified) (1 diff)

uspace/lib/net/generic/packet_remote.c

@@ -70 +70 @@
         aid_t message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
         *packet = (packet_t) as_get_mappable_page(size);
-        if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size))
-            || ERROR_OCCURRED(pm_add(*packet))) {
+        if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size)) ||
+            ERROR_OCCURRED(pm_add(*packet))) {
                 munmap(*packet, size);
                 async_wait_for(message, NULL);

uspace/lib/net/tl/tl_common.c

@@ -157 +157 @@
 }
 
-int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port){
+int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port)
+{
         struct sockaddr_in * address_in;
         struct sockaddr_in6 * address_in6;
         size_t length;
 
-        if(addrlen < 0){
-                return EINVAL;
-        }
+        if (addrlen < 0)
+                return EINVAL;
+        
         length = (size_t) addrlen;
-        if(length < sizeof(struct sockaddr)){
-                return EINVAL;
-        }
-        switch(addr->sa_family){
-                case AF_INET:
-                        if(length != sizeof(struct sockaddr_in)){
+        if (length < sizeof(struct sockaddr))
+                return EINVAL;
+
+        switch (addr->sa_family) {
+        case AF_INET:
+                if (length != sizeof(struct sockaddr_in))
+                        return EINVAL;
+                address_in = (struct sockaddr_in *) addr;
+                address_in->sin_port = htons(port);
+                return EOK;
+        case AF_INET6:
+                if (length != sizeof(struct sockaddr_in6))
                                 return EINVAL;
-                        }
-                        address_in = (struct sockaddr_in *) addr;
-                        address_in->sin_port = htons(port);
-                        return EOK;
-                case AF_INET6:
-                        if(length != sizeof(struct sockaddr_in6)){
-                                return EINVAL;
-                        }
-                        address_in6 = (struct sockaddr_in6 *) addr;
-                        address_in6->sin6_port = htons(port);
-                        return EOK;
-                default:
-                        return EAFNOSUPPORT;
+                address_in6 = (struct sockaddr_in6 *) addr;
+                address_in6->sin6_port = htons(port);
+                return EOK;
+        default:
+                return EAFNOSUPPORT;
         }
 }

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;
 }