From: sobolevn <mail@sobolevn.me>
Date: Tue, 15 Oct 2024 13:12:32 +0000 (+0300)
Subject: gh-125517: Fix unreachable code warnings in `_testembed.c` (#125518)
X-Git-Tag: v3.14.0a1~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8a1818fb01937b66b93728c11d68c9f9af688a5;p=thirdparty%2FPython%2Fcpython.git

gh-125517: Fix unreachable code warnings in `_testembed.c` (#125518)
---

diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst
index 66e845df2e6a..6194d7446c73 100644
--- a/Doc/c-api/init_config.rst
+++ b/Doc/c-api/init_config.rst
@@ -1825,14 +1825,18 @@ return ``-1`` on error:
         PyInitConfig_Free(config);
         return 0;
 
-        // Display the error message
-        const char *err_msg;
     error:
-        (void)PyInitConfig_GetError(config, &err_msg);
-        printf("PYTHON INIT ERROR: %s\n", err_msg);
-        PyInitConfig_Free(config);
+        {
+            // Display the error message
+            // This uncommon braces style is used, because you cannot make
+            // goto targets point to variable declarations.
+            const char *err_msg;
+            (void)PyInitConfig_GetError(config, &err_msg);
+            printf("PYTHON INIT ERROR: %s\n", err_msg);
+            PyInitConfig_Free(config);
 
-        return -1;
+            return -1;
+        }
     }
 
 
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 0fb45b2265e3..d15dd519dbf6 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -1902,11 +1902,13 @@ static int test_initconfig_api(void)
     Py_Finalize();
     return 0;
 
-    const char *err_msg;
 error:
-    (void)PyInitConfig_GetError(config, &err_msg);
-    printf("Python init failed: %s\n", err_msg);
-    exit(1);
+    {
+        const char *err_msg;
+        (void)PyInitConfig_GetError(config, &err_msg);
+        printf("Python init failed: %s\n", err_msg);
+        exit(1);
+    }
 }
 
 
@@ -2050,11 +2052,13 @@ static int test_initconfig_module(void)
     Py_Finalize();
     return 0;
 
-    const char *err_msg;
 error:
-    (void)PyInitConfig_GetError(config, &err_msg);
-    printf("Python init failed: %s\n", err_msg);
-    exit(1);
+    {
+        const char *err_msg;
+        (void)PyInitConfig_GetError(config, &err_msg);
+        printf("Python init failed: %s\n", err_msg);
+        exit(1);
+    }
 }