Merge pull request #1 from radarhere/patch-1

javidcf · web-flow · commit cc448f235c70 · 2022-11-26T08:21:39.000Z
Use break instead of goto
diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c
@@ -347,22 +347,21 @@ load_tkinter_funcs(void) {
             if (!found_tcl) {
                 found_tcl = get_tcl(hMods[i]);
                 if (found_tcl == -1) {
-                    goto exit;
+                    break;
                 }
             }
             if (!found_tk) {
                 found_tk = get_tk(hMods[i]);
                 if (found_tk == -1) {
-                    goto exit;
+                    break;
                 }
             }
             if (found_tcl && found_tk) {
-                goto exit;
+                break;
             }
         }
     }
 
-exit:
     free(hMods);
     if (found_tcl != 1) {
         PyErr_SetString(PyExc_RuntimeError, "Could not find Tcl routines");

Original file line number	Diff line number	Diff line change
`@@ -347,22 +347,21 @@ load_tkinter_funcs(void) {`
`347`	`347`	`if (!found_tcl) {`
`348`	`348`	`found_tcl = get_tcl(hMods[i]);`
`349`	`349`	`if (found_tcl == -1) {`
`350`		`- goto exit;`
	`350`	`+ break;`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`	`if (!found_tk) {`
`354`	`354`	`found_tk = get_tk(hMods[i]);`
`355`	`355`	`if (found_tk == -1) {`
`356`		`- goto exit;`
	`356`	`+ break;`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`	`if (found_tcl && found_tk) {`
`360`		`- goto exit;`
	`360`	`+ break;`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
`365`		`-exit:`
`366`	`365`	`free(hMods);`
`367`	`366`	`if (found_tcl != 1) {`
`368`	`367`	`PyErr_SetString(PyExc_RuntimeError, "Could not find Tcl routines");`