Changeset 7c8267b in mainline for uspace/lib/net/tl/tl_common.c

Timestamp:

2010-09-19T12:55:05Z (14 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.

File:

• uspace/lib/net/tl/tl_common.c (modified) (1 diff)

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