Changeset 1412:4768e3bf1c9b in freeDiameter for freeDiameterd

Timestamp:

Feb 18, 2020, 3:21:20 PM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

committer:

Luke Mewburn <luke@mewburn.net> 1582007266 -39600

Message:

freeDiameter: use standard exit codes

Exit with EXIT_FAILURE (1) on any error,
and EXIT_SUCCESS (0) if ok

File:

• freeDiameterd/main.c (modified) (4 diffs)

freeDiameterd/main.c

@@ -155 +155 @@
         ret = main_cmdline(argc, argv);
         if (ret != 0) {
-                return ret;
+                return EXIT_FAILURE;
         }
 
         if (daemon_mode) {
                 TRACE_DEBUG(INFO, "entering background mode");
-                CHECK_SYS( daemon(1, 0) );
-        }
-
-        CHECK_FCT( pidfile_create() );
+                CHECK_SYS_DO( daemon(1, 0), return EXIT_FAILURE );
+        }
+
+        CHECK_FCT_DO( pidfile_create(), return EXIT_FAILURE );
 
         /* Initialize the core library */
@@ -169 +169 @@
         if (ret != 0) {
                 fprintf(stderr, "An error occurred during freeDiameter core library initialization.\n");
-                return ret;
+                return EXIT_FAILURE;
         }
 
@@ -191 +191 @@
 
         /* Now, just wait for termination */
-        CHECK_FCT( fd_core_wait_shutdown_complete() );
+        CHECK_FCT_DO( fd_core_wait_shutdown_complete(), return EXIT_FAILURE );
 
         /* Just in case it was not the result of a signal, we cancel signals_thr */
         fd_thr_term(&signals_thr);
 
-        return 0;
+        return EXIT_SUCCESS;
 error:
         CHECK_FCT_DO( fd_core_shutdown(),  );
-        CHECK_FCT( fd_core_wait_shutdown_complete() );
+        CHECK_FCT_DO( fd_core_wait_shutdown_complete(), return EXIT_FAILURE );
         fd_thr_term(&signals_thr);
-        return -1;
+        return EXIT_FAILURE;
 }
 
@@ -277 +277 @@
                         case 'h':       /* Print help and exit.  */
                                 main_help();
-                                exit(0);
+                                exit(EXIT_SUCCESS);
 
                         case 'V':       /* Print version and exit.  */
                                 main_version();
-                                exit(0);
+                                exit(EXIT_SUCCESS);
 
                         case 'c':       /* Read configuration from this file instead of the default location..  */