Changeset 5572ad1 in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2012-08-23T21:50:46Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

276e44a

Parents:

ae827d0 (diff), db81577 (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/sock.c (modified) (3 diffs)

uspace/srv/net/tcp/sock.c

@@ -114 +114 @@
         *rsock = NULL;
 
-        sock = calloc(sizeof(tcp_sockdata_t), 1);
+        sock = calloc(1, sizeof(tcp_sockdata_t));
         if (sock == NULL)
                 return ENOMEM;
@@ -277 +277 @@
 
         socket->backlog = backlog;
-        socket->lconn = calloc(sizeof(tcp_conn_t *), backlog);
+        socket->lconn = calloc(backlog, sizeof(tcp_conn_t *));
         if (socket->lconn == NULL) {
                 fibril_mutex_unlock(&socket->lock);
@@ -293 +293 @@
         for (i = 0; i < backlog; i++) {
 
-                lconn = calloc(sizeof(tcp_sock_lconn_t), 1);
+                lconn = calloc(1, sizeof(tcp_sock_lconn_t));
                 if (lconn == NULL) {
                         /* XXX Clean up */