Changeset b40bfac in mainline for uspace/srv/net/netif/lo/lo.c

Timestamp:

2010-11-08T07:13:25Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63a1e60

Parents:

d70a463 (diff), 3da12d74 (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/netif/lo/lo.c (modified) (5 diffs)

uspace/srv/net/netif/lo/lo.c

@@ -37 +37 @@
 #include <async.h>
 #include <errno.h>
-#include <err.h>
 #include <stdio.h>
 #include <str.h>
@@ -83 +82 @@
 int netif_get_device_stats(device_id_t device_id, device_stats_ref stats)
 {
-        ERROR_DECLARE;
-
         netif_device_t *device;
+        int rc;
 
         if (!stats)
                 return EBADMEM;
-        ERROR_PROPAGATE(find_device(device_id, &device));
+        rc = find_device(device_id, &device);
+        if (rc != EOK)
+                return rc;
         memcpy(stats, (device_stats_ref) device->specific,
             sizeof(device_stats_t));
@@ -164 +164 @@
 int netif_probe_message(device_id_t device_id, int irq, uintptr_t io)
 {
-        ERROR_DECLARE;
-
         netif_device_t *device;
+        int rc;
 
         // create a new device
-        ERROR_PROPAGATE(create(device_id, &device));
+        rc = create(device_id, &device);
+        if (rc != EOK)
+                return rc;
         // print the settings
         printf("%s: Device created (id: %d)\n", NAME, device->device_id);
@@ -177 +178 @@
 int netif_send_message(device_id_t device_id, packet_t packet, services_t sender)
 {
-        ERROR_DECLARE;
-
         netif_device_t *device;
         size_t length;
         packet_t next;
         int phone;
-
-        ERROR_PROPAGATE(find_device(device_id, &device));
+        int rc;
+
+        rc = find_device(device_id, &device);
+        if (rc != EOK)
+                return EOK;
         if (device->state != NETIF_ACTIVE) {
                 netif_pq_release(packet_get_id(packet));
@@ -259 +261 @@
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
+        int rc;
         
         /* Start the module */
-        ERROR_PROPAGATE(netif_module_start(netif_client_connection));
-        return EOK;
+        rc = netif_module_start(netif_client_connection);
+        return rc;
 }