Changeset db81577 in mainline

Timestamp:

2012-08-23T15:45:16Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

48e3190, 5572ad1, beb9336

Parents:

f0a2720

Message:

Fix calloc() argument order.

Location:

uspace/srv/net

Files:

• tcp/sock.c (modified) (3 diffs)
• udp/sock.c (modified) (1 diff)

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 */

uspace/srv/net/udp/sock.c

@@ -104 +104 @@
 
         log_msg(LVL_DEBUG, "udp_sock_socket()");
-        sock = calloc(sizeof(udp_sockdata_t), 1);
+        sock = calloc(1, sizeof(udp_sockdata_t));
         if (sock == NULL) {
                 async_answer_0(callid, ENOMEM);