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

Timestamp:

2013-07-17T08:46:06Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (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) (1 diff)

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