X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=fade.c;h=b42e4a1c713c6b660c4c32a2c382bcef7f82cac4;hb=5312e9fd4550454f290a82c114bc2a2bcb66e993;hp=94b866969358126a06d76218832a86f0a985752d;hpb=09e1e9039b42f00bcfa64091700d611931618bca;p=paraslash.git

diff --git a/fade.c b/fade.c
index 94b86696..b42e4a1c 100644
--- a/fade.c
+++ b/fade.c
@@ -34,9 +34,9 @@
 #include "string.h"
 
 
-struct gengetopt_args_info args_info;
+struct fade_args_info args_info;
 
-void para_log(__unused int ll, const char *fmt,...)
+void para_log(__a_unused int ll, const char *fmt,...)
 {
 	va_list argp;
 	time_t t1;
@@ -55,11 +55,11 @@ void para_log(__unused int ll, const char *fmt,...)
  */
 static int open_mixer(void)
 {
-        int mixer_fd;
+	int mixer_fd;
 
-        if ((mixer_fd = open(args_info.mixer_device_arg, O_RDWR, 0)) < 0)
-                return -1;
-        return mixer_fd;
+	if ((mixer_fd = open(args_info.mixer_device_arg, O_RDWR, 0)) < 0)
+		return -1;
+	return mixer_fd;
 }
 
 /*
@@ -279,7 +279,7 @@ int main(int argc, char *argv[])
 {
 	int ret;
 
-	if (cmdline_parser(argc, argv, &args_info))
+	if (fade_cmdline_parser(argc, argv, &args_info))
 		exit(EXIT_FAILURE);
 	ret = configfile_exists();
 	if (!ret && args_info.config_file_given) {
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 	if (ret)
-		cmdline_parser_configfile(args_info.config_file_arg,
+		fade_cmdline_parser_configfile(args_info.config_file_arg,
 			&args_info, 0, 0, 0);
 	if ((ret = open_mixer()) < 0) {
 		PARA_EMERG_LOG("can not open mixer device %s.",