Changeset 73ac2e9 in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-01-12T14:32:59Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

797b704

Parents:

fe5a9fc

Message:

slightly improve error handling

File:

• uspace/srv/net/net/net.c (modified) (4 diffs)

uspace/srv/net/net/net.c

@@ -45 +45 @@
 #include <stdio.h>
 #include <str.h>
+#include <str_error.h>
 
 #include <ipc/ipc.h>
@@ -333 +334 @@
                 return rc;
         
-        
         rc = net_initialize(client_connection);
         if (rc != EOK)
@@ -592 +592 @@
                 rc = start_device(netif);
                 if (rc != EOK) {
+                        printf("%s: Error starting interface %s (%s)\n", NAME,
+                            netif->name, str_error(rc));
                         measured_strings_destroy(&netif->configuration);
                         netifs_exclude_index(&net_globals.netifs, index);
+                        
                         return rc;
                 }
@@ -710 +713 @@
 int main(int argc, char *argv[])
 {
-        int rc;
-        
-        rc = net_module_start(net_client_connection);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: net_module_start error %i\n", NAME, rc);
-                return rc;
-        }
-        
-        return EOK;
+        return net_module_start(net_client_connection);
 }