Small code cleanups

Signed-off-by: Dan McGee <dpmcgee@gmail.com>

4 files changed, 8 insertions, 2 deletions

diff --git a/command.c b/command.c
index 933540e..69457b3 100644
--- a/command.c
+++ b/command.c
@@ -78,6 +78,8 @@ static int cmd_attempt(struct receiver *rcvr,
 	sprintf(fullcmd, "%s%s", cmd->prefix, arg);
 
 	q = malloc(sizeof(struct cmdqueue));
+	if(!q)
+		return -1;
 	q->hash = hash_sdbm(fullcmd);
 	q->cmd = fullcmd;
 	q->next = NULL;
diff --git a/onkyo.c b/onkyo.c
index 90cc983..73e2e92 100644
--- a/onkyo.c
+++ b/onkyo.c
@@ -115,6 +115,8 @@ static int open_connection(int fd)
 
 	if(!ptr) {
 		ptr = calloc(1, sizeof(struct conn));
+		if(!ptr)
+			return -1;
 	}
 	if(!ptr->recv_buf) {
 		ptr->recv_buf = calloc(BUF_SIZE, sizeof(char));
diff --git a/receiver.c b/receiver.c
index d568a4b..6269458 100644
--- a/receiver.c
+++ b/receiver.c
@@ -82,10 +82,12 @@ static char *next_rcvr_command(struct receiver *rcvr)
  */
 int rcvr_send_command(struct receiver *rcvr)
 {
+	char *cmd;
+
 	if(!rcvr->queue)
 		return -1;
 
-	char *cmd = next_rcvr_command(rcvr);
+	cmd = next_rcvr_command(rcvr);
 	if(cmd) {
 		ssize_t retval;
 		size_t cmdsize = strlen(START_SEND) + strlen(cmd)
diff --git a/util.c b/util.c
index b842d31..ffe0258 100644
--- a/util.c
+++ b/util.c
@@ -80,9 +80,9 @@ ssize_t xwrite(int fd, const void *buf, size_t len)
 unsigned long hash_sdbm(const char *str)
 {
 	unsigned long hash = 0;
+	int c;
 	if(!str)
 		return hash;
-	int c;
 	while((c = *str++))
 		hash = c + (hash << 6) + (hash << 16) - hash;