width adjustments for the colorful blackness theme

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index 0b0d2fb7006e6b9c60a9c0526c3d3d0259028463..0f4c5c5084d8dbf31c726ae6d3e5ccf67bcb7d29 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -27,7 +27,7 @@
 
 INIT_AUDIOC_ERRLISTS;
 
-struct gengetopt_args_info conf;
+struct audioc_args_info conf;
 char *tmpfifo;
 
 
@@ -46,10 +46,6 @@ void para_log(int ll, const char* fmt,...)
        va_end(argp);
 }
 
-/* audioc does not use encryption */
-void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata) = NULL;
-void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata) = NULL;
-
 static char *concat_args(const int argc, char * const *argv)
 {
        int i; char *buf = NULL;
@@ -85,11 +81,11 @@ int main(int argc, char *argv[])
                *buf = NULL, *hn = para_hostname(), *args, *home = para_homedir();
 
 
-       if (cmdline_parser(argc, argv, &conf))
+       if (audioc_cmdline_parser(argc, argv, &conf))
                goto out;
        cf = configfile_exists();
        if (cf) {
-               if (cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
+               if (audioc_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
                        fprintf(stderr, "parse error in config file\n");
                        exit(EXIT_FAILURE);
                }
@@ -121,7 +117,6 @@ int main(int argc, char *argv[])
        ret = - E_AUDIOC_CONNECT;
        if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0)
                goto out;
-       fprintf(stderr, "loaded: %d\n", loaded);
        ret = send_cred_buffer(fd, args);
        if (ret < 0)
                goto out;
@@ -131,8 +126,6 @@ int main(int argc, char *argv[])
                fd_set rfd, wfd;
                FD_ZERO(&rfd);
                FD_ZERO(&wfd);
-               if (loaded && loaded > 10000)
-                       fprintf(stderr, "loaded: %d\n", loaded);
                if (loaded < conf.bufsize_arg)
                        para_fd_set(fd, &rfd, &max_fileno);
                if (loaded > 0) {