Changeset bbe7848 in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2010-11-26T14:19:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (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

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

• uspace/srv/net/nil/nildummy/nildummy.c (modified) (2 diffs)

uspace/srv/net/nil/nildummy/nildummy.c

@@ -175 +175 @@
                         device->mtu = NET_DEFAULT_MTU;
                 
-                printf("Device %d already exists:\tMTU\t= %d\n",
+                printf("Device %d already exists:\tMTU\t= %zu\n",
                     device->device_id, device->mtu);
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
@@ -232 +232 @@
         }
         
-        printf("%s: Device registered (id: %d, service: %d, mtu: %d)\n",
+        printf("%s: Device registered (id: %d, service: %d, mtu: %zu)\n",
             NAME, device->device_id, device->service, device->mtu);
         fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);