X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=a8d479e95c7a237f4889ad389a7cf2bf46dc5433;hp=4bbf494c869b6938b596dbf9dcf45b9613fbf924;hb=79e789a4981cf04634113056b320899e57b7e822;hpb=5cb5db1fbf8f9b96c3b5a1e0cc7de9e710757540

diff --git a/command.c b/command.c
index 4bbf494c..a8d479e9 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -35,8 +35,8 @@
 #include "signal.h"
 #include "version.h"
 
-struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY};
-struct server_command server_cmds[] = {DEFINE_SERVER_CMD_ARRAY};
+static struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY};
+static struct server_command server_cmds[] = {DEFINE_SERVER_CMD_ARRAY};
 
 /** Commands including options must be shorter than this. */
 #define MAX_COMMAND_LEN 32768
@@ -110,7 +110,6 @@ static unsigned get_status(struct misc_meta_data *nmmd, int parser_friendly,
 	char mtime[30] = "";
 	char *status, *flags; /* vss status info */
 	/* nobody updates our version of "now" */
-	char *ut = get_server_uptime_str(NULL);
 	long offset = (nmmd->offset + 500) / 1000;
 	struct timeval current_time;
 	struct tm mtime_tm;
@@ -144,7 +143,6 @@ static unsigned get_status(struct misc_meta_data *nmmd, int parser_friendly,
 		(long unsigned)current_time.tv_usec);
 	free(flags);
 	free(status);
-	free(ut);
 	*result = b.buf;
 	return b.offset;
 }
@@ -220,8 +218,8 @@ int send_sb(struct stream_cipher_context *scc, void *buf, size_t numbytes,
 	int ret;
 	struct sb_context *sbc;
 	struct iovec iov[2];
-	struct sb_buffer sbb = SBB_INIT(band, buf, numbytes);
 	sb_transformation trafo = band < SBD_PROCEED? NULL : sc_trafo;
+	struct sb_buffer sbb = SBB_INIT(band, buf, numbytes);
 
 	sbc = sb_new_send(&sbb, dont_free, trafo, scc->send);
 	do {
@@ -554,6 +552,7 @@ static int send_list_of_commands(struct command_context *cc, struct server_comma
 		msg = para_strcat(msg, tmp);
 		free(tmp);
 	}
+	assert(msg);
 	return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
 }
 
@@ -842,7 +841,7 @@ static int parse_sb_command(struct command_context *cc, struct iovec *iov)
 	if (ret < 0)
 		goto out;
 	end = iov->iov_base + iov->iov_len;
-	for (i = 0, p = iov->iov_base; p < end; i++)
+	for (i = 0; p < end; i++)
 		p += strlen(p) + 1;
 	cc->argc = i;
 	cc->argv = para_malloc((cc->argc + 1) * sizeof(char *));