Cosmetics: Rename some functions.

Add "_or_die" suffix to functions that exit on errors.

diff --git a/audiod.c b/audiod.c
index 56661b802948cc4a2ff8601e6f227c56c134a1fe..fc4ac6f5017b2eb5c4876d0c29a0bd53ba512b8f 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1136,7 +1136,7 @@ int main(int argc, char *argv[])
        valid_fd_012();
        audiod_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("audiod", conf);
        valid_fd_012();
        audiod_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("audiod", conf);

-       para_drop_privileges(conf.user_arg, conf.group_arg);
+       drop_privileges_or_die(conf.user_arg, conf.group_arg);

        parse_config_or_die();
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);
        parse_config_or_die();
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);

diff --git a/daemon.c b/daemon.c
index f7a19221aa78fddd860415e6d4ab8b368c146992..6c1321b20eb22a99649fdc9b98a00e73ce233301 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -116,7 +116,7 @@ void log_welcome(const char *whoami, int loglevel)
  *
  * \sa getpwnam(3), getuid(2), setuid(2), getgrnam(2), setgid(2)
  */
  *
  * \sa getpwnam(3), getuid(2), setuid(2), getgrnam(2), setgid(2)
  */

-void para_drop_privileges(const char *username, const char *groupname)
+void drop_privileges_or_die(const char *username, const char *groupname)

 {
        struct passwd *p;
        char *tmp;
 {
        struct passwd *p;
        char *tmp;

diff --git a/daemon.h b/daemon.h
index e1b8149aaba8b83af3476a6ba988bcd4722a42d5..4f071361d1675cb2e3416a33b16940874834f223 100644 (file)
--- a/daemon.h
+++ b/daemon.h
@@ -5,7 +5,7 @@ void daemon_init(void);
 FILE *open_log(const char *logfile_name);
 void close_log(FILE* logfile);
 void log_welcome(const char *whoami, int loglevel);
 FILE *open_log(const char *logfile_name);
 void close_log(FILE* logfile);
 void log_welcome(const char *whoami, int loglevel);

-void para_drop_privileges(const char *username, const char *groupname);
+void drop_privileges_or_die(const char *username, const char *groupname);

 /** used for server_uptime() */
 enum uptime {UPTIME_SET, UPTIME_GET};
 time_t server_uptime(enum uptime set_or_get);
 /** used for server_uptime() */
 enum uptime {UPTIME_SET, UPTIME_GET};
 time_t server_uptime(enum uptime set_or_get);

diff --git a/server.c b/server.c
index 287b628b0d2e7ffee18886f8885f58882d6e155a..a1180673c7f72a228460466cbe56acd37f529c84 100644 (file)
--- a/server.c
+++ b/server.c
@@ -166,7 +166,7 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
 /*
  * setup shared memory area and get mutex for locking
  */
 /*
  * setup shared memory area and get mutex for locking
  */

-static void shm_init(void)
+static void init_ipc_or_die(void)

 {
        void *shm;
        int ret = shm_new(sizeof(struct misc_meta_data));
 {
        void *shm;
        int ret = shm_new(sizeof(struct misc_meta_data));


@@ -198,7 +198,7 @@ err_out:
        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 

-static void parse_config(int override)
+static void parse_config_or_die(int override)

 {
        char *home = para_homedir();
        struct stat statbuf;
 {
        char *home = para_homedir();
        struct stat statbuf;


@@ -259,7 +259,7 @@ static void handle_sighup(void)
        PARA_NOTICE_LOG("SIGHUP\n");
        close_log(logfile); /* gets reopened if necessary by parse_config */
        logfile = NULL;
        PARA_NOTICE_LOG("SIGHUP\n");
        close_log(logfile); /* gets reopened if necessary by parse_config */
        logfile = NULL;

-       parse_config(1); /* reopens log */
+       parse_config_or_die(1); /* reopens log */

        init_user_list(user_list_file); /* reload user list */
        if (mmd->afs_pid)
                kill(mmd->afs_pid, SIGHUP);
        init_user_list(user_list_file); /* reload user list */
        if (mmd->afs_pid)
                kill(mmd->afs_pid, SIGHUP);


@@ -482,11 +482,11 @@ static void server_init(int argc, char **argv)
        /* parse command line options */
        server_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("server", conf);
        /* parse command line options */
        server_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("server", conf);

-       para_drop_privileges(conf.user_arg, conf.group_arg);
+       drop_privileges_or_die(conf.user_arg, conf.group_arg);

        /* parse config file, open log and set defaults */
        /* parse config file, open log and set defaults */

-       parse_config(0);
+       parse_config_or_die(0);

        log_welcome("para_server", conf.loglevel_arg);
        log_welcome("para_server", conf.loglevel_arg);

-       shm_init(); /* init mmd struct */
+       init_ipc_or_die(); /* init mmd struct and mmd->lock */

        /* make sure, the global now pointer is uptodate */
        gettimeofday(now, NULL);
        server_uptime(UPTIME_SET); /* reset server uptime */
        /* make sure, the global now pointer is uptodate */
        gettimeofday(now, NULL);
        server_uptime(UPTIME_SET); /* reset server uptime */