Changeset ff381a7 in mainline for uspace/srv/net/tcp/conn.c

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/srv/net/tcp/conn.c (modified) (1 diff)

uspace/srv/net/tcp/conn.c

@@ -1223 +1223 @@
                 rc = amap_insert(amap, &conn->ident, conn, af_allow_system, &aepp);
                 if (rc != EOK) {
-                        assert(rc != EEXISTS);
+                        assert(rc != EEXIST);
                         assert(rc == ENOMEM);
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");