colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use EXIT_FAILURE/EXIT_SUCCESS

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2758 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-31 02:05:20 +00:00
parent 52033721dd
commit 73d81d0a7c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NetworkManager.c
View File

@@ -259,7 +259,7 @@ main (int argc, char *argv[])
NMDBusManager * dbus_mgr = NULL; NMDBusManager * dbus_mgr = NULL;
DBusConnection *dbus_connection; DBusConnection *dbus_connection;
NMSupplicantManager * sup_mgr = NULL; NMSupplicantManager * sup_mgr = NULL;
int exit_status = EXIT_FAILURE; int exit_status = 1;
GOptionEntry options[] = { GOptionEntry options[] = {
{"no-daemon", 0, 0, G_OPTION_ARG_NONE, &become_daemon, "Don't become a daemon", NULL}, {"no-daemon", 0, 0, G_OPTION_ARG_NONE, &become_daemon, "Don't become a daemon", NULL},
@@ -285,7 +285,7 @@ main (int argc, char *argv[])
if (show_usage == TRUE) { if (show_usage == TRUE) {
nm_print_usage(); nm_print_usage();
exit_status = EXIT_SUCCESS; exit_status = 0;
goto exit; goto exit;
} }
@@ -400,7 +400,7 @@ main (int argc, char *argv[])
nm_system_enable_loopback (); nm_system_enable_loopback ();
/* Run the main loop */ /* Run the main loop */
exit_status = EXIT_SUCCESS; exit_status = 0;
g_main_loop_run (main_loop); g_main_loop_run (main_loop);
done: done:

4
src/nm-hal-manager.c
View File

@@ -386,7 +386,7 @@ name_owner_changed (NMDBusManager *dbus_mgr,
if (!old_owner_good && new_owner_good) { if (!old_owner_good && new_owner_good) {
/* HAL just appeared */ /* HAL just appeared */
if (!hal_init (manager)) if (!hal_init (manager))
exit (EXIT_FAILURE); exit (1);
} else if (old_owner_good && !new_owner_good) { } else if (old_owner_good && !new_owner_good) {
/* HAL went away. Bad HAL. */ /* HAL went away. Bad HAL. */
hal_deinit (manager); hal_deinit (manager);
@@ -408,7 +408,7 @@ connection_changed (NMDBusManager *dbus_mgr,
if ((owner = nm_dbus_manager_get_name_owner (dbus_mgr, "org.freedesktop.Hal"))) { if ((owner = nm_dbus_manager_get_name_owner (dbus_mgr, "org.freedesktop.Hal"))) {
if (!hal_init (manager)) if (!hal_init (manager))
exit (EXIT_FAILURE); exit (1);
g_free (owner); g_free (owner);
} }
} }