Move var setting into the only case using it

The original function was more complex than this. This refactoring
avoids a false positive in the static checker

1 files changed, 2 insertions, 5 deletions

diff --git a/psycopg/bytes_format.c b/psycopg/bytes_format.c
index cd06b1c..767aafa 100644
--- a/psycopg/bytes_format.c
+++ b/psycopg/bytes_format.c
@@ -207,11 +207,6 @@ Bytes_Format(PyObject *format, PyObject *args)
                                 "incomplete format");
                 goto error;
             }
-            if (c != '%') {
-                v = getnextarg(args, arglen, &argidx);
-                if (v == NULL)
-                    goto error;
-            }
             switch (c) {
             case '%':
                 pbuf = "%";
@@ -219,6 +214,8 @@ Bytes_Format(PyObject *format, PyObject *args)
                 break;
             case 's':
                 /* only bytes! */
+                if (!(v = getnextarg(args, arglen, &argidx)))
+                    goto error;
                 if (!Bytes_CheckExact(v)) {
                     PyErr_Format(PyExc_ValueError,
                                     "only bytes values expected, got %s",