From b94767ff44edf5d461d7cb1c8eb5160f83886358 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Tue, 22 Feb 2011 20:15:44 +0000
Subject: Issue #8914: fix various warnings from the Clang static analyzer
 v254.

---
 Python/getargs.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Python/getargs.c')

diff --git a/Python/getargs.c b/Python/getargs.c
index 600941d9c7..17d5993c8a 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -966,9 +966,10 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
     case 'u': /* raw unicode buffer (Py_UNICODE *) */
     case 'Z': /* raw unicode buffer or None */
     {
+        Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
+
         if (*format == '#') { /* any buffer-like object */
             /* "s#" or "Z#" */
-            Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
             FETCH_SIZE;
 
             if (c == 'Z' && arg == Py_None) {
@@ -984,8 +985,6 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
             format++;
         } else {
             /* "s" or "Z" */
-            Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
-
             if (c == 'Z' && arg == Py_None)
                 *p = NULL;
             else if (PyUnicode_Check(arg)) {
-- 
cgit v1.2.1