X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=92002c340e62c0593bc2b534193d8fecb1ea997b;hb=44bfd8564c5b85fe394f847a713ab5e6710fd03c;hp=26126cc938cc0f8c9bb751b2cebf6f7ee52d5169;hpb=6eab6671f857009b6d6a2de2c2ec8187f869f705;p=paraslash.git

diff --git a/command.c b/command.c
index 26126cc9..92002c34 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.
  */
@@ -115,7 +115,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;
@@ -149,7 +148,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;
 }
@@ -366,7 +364,7 @@ static int com_sender(struct command_context *cc)
 			usleep(100 * 1000);
 			continue;
 		}
-		memcpy(&mmd->sender_cmd_data, &scd, sizeof(scd));
+		mmd->sender_cmd_data = scd;
 		mutex_unlock(mmd_mutex);
 		break;
 	}
@@ -389,7 +387,6 @@ static int com_si(struct command_context *cc)
 	}
 	ut = get_server_uptime_str(now);
 	ret = xasprintf(&msg,
-		"version: %s\n"
 		"up: %s\nplayed: %u\n"
 		"server_pid: %d\n"
 		"afs_pid: %d\n"
@@ -397,7 +394,6 @@ static int com_si(struct command_context *cc)
 		"current loglevel: %s\n"
 		"supported audio formats: %s\n"
 		"%s",
-		version_git(),
 		ut, mmd->num_played,
 		(int)getppid(),
 		(int)mmd->afs_pid,