From 73d81d0a7c07ccd2c138a09259c642756f669da7 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 31 Aug 2007 02:05:20 +0000 Subject: [PATCH] Don't use EXIT_FAILURE/EXIT_SUCCESS git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2758 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- src/NetworkManager.c | 6 +++--- src/nm-hal-manager.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NetworkManager.c b/src/NetworkManager.c index 839be10c5f..e76cc2f715 100644 --- a/src/NetworkManager.c +++ b/src/NetworkManager.c @@ -259,7 +259,7 @@ main (int argc, char *argv[]) NMDBusManager * dbus_mgr = NULL; DBusConnection *dbus_connection; NMSupplicantManager * sup_mgr = NULL; - int exit_status = EXIT_FAILURE; + int exit_status = 1; GOptionEntry options[] = { {"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) { nm_print_usage(); - exit_status = EXIT_SUCCESS; + exit_status = 0; goto exit; } @@ -400,7 +400,7 @@ main (int argc, char *argv[]) nm_system_enable_loopback (); /* Run the main loop */ - exit_status = EXIT_SUCCESS; + exit_status = 0; g_main_loop_run (main_loop); done: diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c index 9adf183fdd..4a3bafedbc 100644 --- a/src/nm-hal-manager.c +++ b/src/nm-hal-manager.c @@ -386,7 +386,7 @@ name_owner_changed (NMDBusManager *dbus_mgr, if (!old_owner_good && new_owner_good) { /* HAL just appeared */ if (!hal_init (manager)) - exit (EXIT_FAILURE); + exit (1); } else if (old_owner_good && !new_owner_good) { /* HAL went away. Bad HAL. */ 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 (!hal_init (manager)) - exit (EXIT_FAILURE); + exit (1); g_free (owner); } }