Changeset dd0c8a0 in mainline for uspace/lib/c/generic/net/socket_parse.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/c/generic/net/socket_parse.c (modified) (2 diffs)

uspace/lib/c/generic/net/socket_parse.c

@@ -53 +53 @@
 int socket_parse_address_family(const char *name, int *af)
 {
-        if (str_lcmp(name, "AF_INET", 7) == 0) {
-                *af = AF_INET;
+        if (str_lcmp(name, "AF_INET6", 8) == 0) {
+                *af = AF_INET6;
                 return EOK;
         }
         
-        if (str_lcmp(name, "AF_INET6", 8) == 0) {
-                *af = AF_INET6;
+        if (str_lcmp(name, "AF_INET", 7) == 0) {
+                *af = AF_INET;
                 return EOK;
         }
@@ -79 +79 @@
 int socket_parse_protocol_family(const char *name, int *pf)
 {
+        if (str_lcmp(name, "PF_INET6", 8) == 0) {
+                *pf = PF_INET6;
+                return EOK;
+        }
+
         if (str_lcmp(name, "PF_INET", 7) == 0) {
                 *pf = PF_INET;
-                return EOK;
-        }
-        
-        if (str_lcmp(name, "PF_INET6", 8) == 0) {
-                *pf = PF_INET6;
                 return EOK;
         }