[sr-dev] git:master:30cdc11f: janssonrpc-c: declare variables at beginning of netstring_read_fd()

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 30cdc11f30e10bca5821609d86d31ffc1b5bd3c8
URL: https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ffc1b5bd3c8

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2016-11-01T15:37:08+01:00

janssonrpc-c: declare variables at beginning of netstring_read_fd()

---

Modified: modules/janssonrpc-c/netstring.c

---

Diff:  https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ffc1b5bd3c8.diff
Patch: https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ffc1b5bd3c8.patch

---

diff --git a/modules/janssonrpc-c/netstring.c b/modules/janssonrpc-c/netstring.c
index a559224..7414f0d 100644
--- a/modules/janssonrpc-c/netstring.c
+++ b/modules/janssonrpc-c/netstring.c
@@ -141,12 +141,14 @@ int netstring_read_fd(int fd, netstring_t **netstring)
 	int bytes, offset;
 	size_t read_len;
 	char *temp_buffer;
+	int total;
+	int i, len;
+	char peek[10]={0};
 	temp_buffer = NULL;
 	offset = 0;
 
 	if (*netstring == NULL) {
 		/* No buffer yet. Peek at first 10 bytes, to get length and colon. */
-		char peek[10]={0};
 		bytes = recv(fd,peek,10,MSG_PEEK);
 
 		if (bytes < 3) return NETSTRING_INCOMPLETE;
@@ -158,7 +160,6 @@ int netstring_read_fd(int fd, netstring_t **netstring)
 		/* The netstring must start with a number */
 		if (!isdigit(peek[0])) return NETSTRING_ERROR_NO_LENGTH;
 
-		int i, len;
 		len = i = 0;
 
 		/* Read the number of bytes */
@@ -194,7 +195,8 @@ int netstring_read_fd(int fd, netstring_t **netstring)
 
 	/* Read from the socket */
 	bytes = recv(fd, temp_buffer, read_len, 0);
-	int total = (*netstring)->read += bytes;
+	(*netstring)->read += bytes;
+	total = (*netstring)->read;
 
 	/* See if we have the whole netstring yet */
 	if (read_len > bytes) {