From fc4a3a848cf7427c5973654cab8ebfb7f52b1020 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Wed, 30 Mar 2011 10:30:11 +0300 Subject: [PATCH] Fix some clang analyzer warnings. --- src/admin.c | 1 - src/objects.c | 2 +- src/proto.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/admin.c b/src/admin.c index 6f19379..160d337 100644 --- a/src/admin.c +++ b/src/admin.c @@ -928,7 +928,6 @@ static void copy_arg_unquote(const char *str, regmatch_t *glist, const char *end = src + len; if (len < dstmax) { - len = 0; while (src < end) { if (src[0] == '\'' && src[1] == '\'') { *dst++ = '\''; diff --git a/src/objects.c b/src/objects.c index 48533d0..15e6410 100644 --- a/src/objects.c +++ b/src/objects.c @@ -699,7 +699,7 @@ bool release_server(PgSocket *server) void disconnect_server(PgSocket *server, bool notify, const char *reason, ...) { PgPool *pool = server->pool; - PgSocket *client = server->link; + PgSocket *client; static const uint8_t pkt_term[] = {'X', 0,0,0,4}; int send_term = 1; usec_t now = get_cached_time(); diff --git a/src/proto.c b/src/proto.c index 3cc665c..352e08e 100644 --- a/src/proto.c +++ b/src/proto.c @@ -391,11 +391,11 @@ int scan_text_result(struct MBuf *pkt, const char *tupdesc, ...) switch (tupdesc[i]) { case 'i': int_p = va_arg(ap, int *); - *int_p = atoi(val); + *int_p = val ? atoi(val) : 0; break; case 'q': long_p = va_arg(ap, uint64_t *); - *long_p = atoll(val); + *long_p = val ? atoll(val) : 0; break; case 's': str_p = va_arg(ap, const char **); -- 2.40.0