X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=0fae454c51708a5db51a2833e1fa5fc74d0b72a2;hb=5fd6c1a5acae2a52545e081ac4b38717c7295d80;hp=0e8e5981085b7d05b8a2a08f35a9bb7944a4d72d;hpb=a5a6446fd1af4a0ad03ef06a3c194d37d6a46acd;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 0e8e5981..0fae454c 100644
--- a/audiod.c
+++ b/audiod.c
@@ -46,8 +46,9 @@ static struct lls_parse_result *lpr;
 #define OPT_UINT32_VAL(_name) (lls_uint32_val(0, OPT_RESULT(_name)))
 
 __printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
-/** define the array containing all supported audio formats */
-const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
+/* Audio formats supported by audiod */
+static const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY};
+#define NUM_AUDIO_FORMATS ARRAY_SIZE(audio_formats)
 
 /** Defines how audiod handles one supported audio format. */
 struct audio_format_info {
@@ -290,7 +291,7 @@ static int get_play_time_slot_num(void)
  *
  * \return A string that must be freed by the caller.
  */
-char *get_time_string(void)
+__malloc char *get_time_string(void)
 {
 	int ret, seconds = 0, length = stat_task->length_seconds;
 	struct timeval *tmp, sum, sss, /* server stream start */
@@ -958,7 +959,7 @@ static int init_default_filters(void)
 		 */
 		if (strcmp(name, "udp") == 0 || strcmp(name, "dccp") == 0) {
 			tmp = para_strdup("fecdec");
-			add_filter(i, tmp);
+			ret = add_filter(i, tmp);
 			free(tmp);
 			if (ret < 0)
 				goto out;