Changeset 7bdcc45 in mainline for uspace/app/nettest2/nettest2.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/app/nettest2/nettest2.c (modified) (4 diffs)

uspace/app/nettest2/nettest2.c

@@ -302 +302 @@
         /* Check data buffer size. */
         if (size <= 0) {
-                fprintf(stderr, "Data buffer size too small (%d). Using 1024 "
+                fprintf(stderr, "Data buffer size too small (%zu). Using 1024 "
                     "bytes instead.\n", size);
                 size = 1024;
@@ -336 +336 @@
                 return ENOMEM;
         }
-        socket_ids[sockets] = NULL;
+        socket_ids[sockets] = 0;
 
         if (verbose)
@@ -375 +375 @@
                 printf("\tOK\n");
 
-        printf("sendto + recvfrom tested in %d microseconds\n",
+        printf("sendto + recvfrom tested in %ld microseconds\n",
             tv_sub(&time_after, &time_before));
 
@@ -403 +403 @@
                 printf("\tOK\n");
 
-        printf("sendto, recvfrom tested in %d microseconds\n",
+        printf("sendto, recvfrom tested in %ld microseconds\n",
             tv_sub(&time_after, &time_before));