bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Silence a vfprintf valgrind error

Browse Source 
Turns out that %lld causes valgrind to find an uninitialised variable
problem inside vfprintf.  Avoid it here by s/%lld/%d/.
This commit is contained in:
Alex Young
2012-07-13 11:57:46 +01:00
parent 2a50b64a43
commit 40101e49f3
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.c
View File

@@ -316,7 +316,7 @@ int client_request_needs_reply( struct client * client,
"after an entrust message."); "after an entrust message.");
/* check it's not out of range */ /* check it's not out of range */
if ( request.from+request.len > client->serve->size) { if ( request.from+request.len > client->serve->size) {
debug("request read %llx+%ld out of range", debug("request read %d+%d out of range",
request.from, request.from,
request.len request.len
); );
@@ -435,7 +435,7 @@ void client_reply( struct client* client, struct nbd_request request )
/* Returns 0 if we should continue trying to serve requests */ /* Returns 0 if we should continue trying to serve requests */
int client_serve_request(struct client* client) int client_serve_request(struct client* client)
{ {
struct nbd_request request; struct nbd_request request = {0};
int failure = 1; int failure = 1;
int disconnected = 0; int disconnected = 0;

8
src/util.c
View File

@@ -44,6 +44,8 @@ void exit_err( const char *msg )
void mylog(int line_level, const char* format, ...) void mylog(int line_level, const char* format, ...)
{ {
va_list argptr; va_list argptr;
char * format_n = NULL;
int format_len;
if (line_level < log_level) { return; } if (line_level < log_level) { return; }
@@ -52,9 +54,9 @@ void mylog(int line_level, const char* format, ...)
* and avoid a second fprintf. This stops log lines from getting * and avoid a second fprintf. This stops log lines from getting
* interleaved. * interleaved.
*/ */
int format_len = strlen( format ); format_len = strlen( format );
char *format_n = xmalloc( format_len + 2 ); format_n = xmalloc( format_len + 2 );
memcpy( format_n, format, format_len ); memcpy( format_n, format, format_len+1 );
format_n[format_len] = '\n'; format_n[format_len] = '\n';
va_start(argptr, format); va_start(argptr, format);