Merge branch 'refs/heads/t/hash-sort-for-ls'

[paraslash.git] / audiod_command.c

diff --git a/audiod_command.c b/audiod_command.c
index 8a87d91e108f4470f127d35538bb16ef920f5c76..cccc2a8908d933d0d5ef2f41bb6b79dc11602baf 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -15,12 +15,11 @@
 #include <netdb.h>
 #include <lopsub.h>
 
+#include "audiod.lsg.h"
 #include "para.h"
 #include "audiod_cmd.lsg.h"
-#include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "grab_client.h"
@@ -417,7 +416,7 @@ EXPORT_AUDIOD_CMD_HANDLER(version)
  * \return Positive on success, negative on errors, zero if there was no
  * connection to accept.
  *
- * \sa para_accept(), recv_cred_buffer()
+ * \sa \ref para_accept(), \ref recv_cred_buffer().
  * */
 int handle_connect(int accept_fd, fd_set *rfds)
 {
@@ -427,7 +426,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
        uid_t uid;
        const struct lls_command *cmd;
        struct lls_parse_result *lpr;
-       char *errctx;
+       char *errctx = NULL;
        const struct audiod_command_info *aci;
 
        ret = para_accept(accept_fd, rfds, &unix_addr, sizeof(struct sockaddr_un), &clifd);