ortp_send: kill useless gettimeofday()

[paraslash.git] / random_selector.c

diff --git a/random_selector.c b/random_selector.c
index 0dca17279ce5fd8133081190ce72776bbb24f71d..ec1f5c6c53c39982cdf2ed488447598bcbfb59cd 100644 (file)
--- a/random_selector.c
+++ b/random_selector.c
@@ -33,7 +33,7 @@ extern struct misc_meta_data *mmd;
 static unsigned int num_audio_files, audio_file_count;
 static char **audio_file_list;
 
-static int count_audio_files(__unused const char *dir, __unused const char *name)
+static int count_audio_files(__a_unused const char *dir, __a_unused const char *name)
 {
        num_audio_files++;
        return 1;
@@ -64,7 +64,7 @@ static struct server_command cmds[] = {
 }
 };
 
-static int com_random_info(int fd, __unused int argc, __unused char *argv[])
+static int com_random_info(int fd, __a_unused int argc, __a_unused char *argv[])
 {
        return send_buffer(fd, "Don't use for huge directories as it is "
                "very inefficient in this case.\n");
@@ -98,7 +98,7 @@ static char **random_get_audio_file_list(unsigned int num)
                goto out;
        /* careful, files might got deleted underneath */
        num_audio_files = audio_file_count; /* can only decrease */
-       len = MIN(num, num_audio_files);
+       len = PARA_MIN(num, num_audio_files);
        ret = -E_NOTHING_FOUND;
        if (!len) /* nothing found, return NULL */
                goto out;
@@ -124,9 +124,6 @@ static void random_shutdown(void)
 {
 }
 
-/** random's (constant) database info text */
-#define DBINFO "dbinfo1:database info? You're kidding. I'm still dopey!\ndbinfo2:\ndbinfo3:\n"
-
 /**
  *  the init function for the random audio file selector
  *
@@ -140,7 +137,8 @@ int random_selector_init(struct audio_file_selector *db)
        struct timeval now;
 
        PARA_INFO_LOG("%s", "registering random handlers ;)\n");
-       sprintf(mmd->selector_info, DBINFO);
+       sprintf(mmd->selector_info, "dbinfo1:database info? You're kidding. "
+               "I'm still dopey!\ndbinfo2:\ndbinfo3:\n");
        gettimeofday(&now, NULL);
        srand(now.tv_usec);
        db->cmd_list = cmds;