Changeset f8e8738 in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-04-07T20:22:40Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fee6381

Parents:

61257f4 (diff), a82889e (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:

Changes from development

File:

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

uspace/srv/net/net/net.c

@@ -555 +555 @@
                 rc = read_netif_configuration(conf_files[i], netif);
                 if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return rc;
@@ -565 +565 @@
                 if (!setting) {
                         fprintf(stderr, "%s: Network interface name is missing\n", NAME);
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return EINVAL;
@@ -574 +574 @@
                 int index = netifs_add(&net_globals.netifs, netif->id, netif);
                 if (index < 0) {
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return index;
@@ -586 +586 @@
                     index);
                 if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration);
-                        netifs_exclude_index(&net_globals.netifs, index);
+                        measured_strings_destroy(&netif->configuration, free);
+                        netifs_exclude_index(&net_globals.netifs, index, free);
                         return rc;
                 }
@@ -595 +595 @@
                         printf("%s: Ignoring failed interface %s (%s)\n", NAME,
                             netif->name, str_error(rc));
-                        measured_strings_destroy(&netif->configuration);
-                        netifs_exclude_index(&net_globals.netifs, index);
+                        measured_strings_destroy(&netif->configuration, free);
+                        netifs_exclude_index(&net_globals.netifs, index, free);
                         continue;
                 }