]> granicus.if.org Git - pgbouncer/commitdiff
Fix some clang analyzer warnings.
authorMarko Kreen <markokr@gmail.com>
Wed, 30 Mar 2011 07:30:11 +0000 (10:30 +0300)
committerMarko Kreen <markokr@gmail.com>
Wed, 30 Mar 2011 07:30:11 +0000 (10:30 +0300)
src/admin.c
src/objects.c
src/proto.c

index 6f19379f2c83e5839f760bccf371b68223d01c98..160d33727065f103fda2fbf8a59f8e9999cc50a2 100644 (file)
@@ -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++ = '\'';
index 48533d044ca0907bfc50813050478baffe598a29..15e6410c42d3ff5b25a1643dacc5d021f69b194e 100644 (file)
@@ -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();
index 3cc665c1c84c410faaa463b2f2b84f4bfe4048f3..352e08e08c73435bdd508c89342028c17035a8d0 100644 (file)
@@ -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 **);