Merge branch 'refs/heads/t/si_conversion'

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 52f4153bbafa216671e5d624bb81965e41648f35..69564336c6f8228a072f699ad83dbbe19d154338 100644 (file)
--- a/command.c
+++ b/command.c
@@ -107,8 +107,8 @@ static unsigned get_status(struct misc_meta_data *nmmd, bool parser_friendly,
        clock_get_realtime(&current_time);
        /*
         * The calls to WRITE_STATUS_ITEM() below never fail because
        clock_get_realtime(&current_time);
        /*
         * The calls to WRITE_STATUS_ITEM() below never fail because

-        * b->max_size is zero (unlimited), see para_printf(). However, clang
-        * is not smart enough to prove this and complains nevertheless.
+        * b->max_size is zero (unlimited), see \ref para_printf(). However,
+        * clang is not smart enough to prove this and complains nevertheless.

         * Casting the return value to void silences clang.
         */
        (void)WRITE_STATUS_ITEM(&b, SI_status, "%s\n", status);
         * Casting the return value to void silences clang.
         */
        (void)WRITE_STATUS_ITEM(&b, SI_status, "%s\n", status);


@@ -227,7 +227,7 @@ static int check_sender_args(struct command_context *cc,
                struct lls_parse_result *lpr, struct sender_command_data *scd)
 {
        int i, ret;
                struct lls_parse_result *lpr, struct sender_command_data *scd)
 {
        int i, ret;

-       const char *subcmds[] = {SENDER_SUBCOMMANDS};
+       const char * const subcmds[] = {SENDER_SUBCOMMANDS};

        const char *arg;
        char *errctx;
        unsigned num_inputs = lls_num_inputs(lpr);
        const char *arg;
        char *errctx;
        unsigned num_inputs = lls_num_inputs(lpr);


@@ -246,10 +246,10 @@ static int check_sender_args(struct command_context *cc,
                return -E_COMMAND_SYNTAX;
        scd->sender_num = i;
        arg = lls_input(1, lpr);
                return -E_COMMAND_SYNTAX;
        scd->sender_num = i;
        arg = lls_input(1, lpr);

-       for (i = 0; subcmds[i]; i++)
+       for (i = 0; i < NUM_SENDER_CMDS; i++)

                if (!strcmp(subcmds[i], arg))
                        break;
                if (!strcmp(subcmds[i], arg))
                        break;

-       if (!subcmds[i])
+       if (i == NUM_SENDER_CMDS)

                return -E_COMMAND_SYNTAX;
        scd->cmd_num = i;
        if (!senders[scd->sender_num].client_cmds[scd->cmd_num])
                return -E_COMMAND_SYNTAX;
        scd->cmd_num = i;
        if (!senders[scd->sender_num].client_cmds[scd->cmd_num])


@@ -457,10 +457,9 @@ EXPORT_SERVER_CMD_HANDLER(version);
        ITEM(num_chunks) \
        ITEM(amplification) \
 
        ITEM(num_chunks) \
        ITEM(amplification) \
 

-/**
- * Write a list of audio-file related status items with empty values.
- *
- * This is used by vss when currently no audio file is open.
+/*
+ * Create a set of audio-file related status items with empty values. These are
+ * written to stat clients when no audio file is open.

  */
 static unsigned empty_status_items(bool parser_friendly, char **result)
 {
  */
 static unsigned empty_status_items(bool parser_friendly, char **result)
 {


@@ -884,7 +883,7 @@ static int run_command(struct command_context *cc, struct iovec *iov,
  * the function if the connection was not authenticated when the timeout
  * expires.
  *
  * the function if the connection was not authenticated when the timeout
  * expires.
  *

- * \sa alarm(2), crypt.c, crypt.h
+ * \sa alarm(2), \ref crypt.c, \ref crypt.h.

  */
 __noreturn void handle_connect(int fd, const char *peername)
 {
  */
 __noreturn void handle_connect(int fd, const char *peername)
 {


@@ -893,7 +892,7 @@ __noreturn void handle_connect(int fd, const char *peername)
        unsigned char challenge_hash[HASH_SIZE];
        char *command = NULL, *buf = para_malloc(HANDSHAKE_BUFSIZE) /* must be on the heap */;
        size_t numbytes;
        unsigned char challenge_hash[HASH_SIZE];
        char *command = NULL, *buf = para_malloc(HANDSHAKE_BUFSIZE) /* must be on the heap */;
        size_t numbytes;

-       struct command_context cc_struct = {.peer = peername}, *cc = &cc_struct;
+       struct command_context cc_struct = {.u = NULL}, *cc = &cc_struct;

        struct iovec iov;
        struct connection_features cf;
 
        struct iovec iov;
        struct connection_features cf;