gh-115914: minor cleanup: simplify filename_obj assignment in PyRun_AnyFileExFlags (gh-115916)

gorsing · web-flow · commit f082a05c67cc · 2024-02-25T12:45:38.000-08:00
This simplifies the code: less lines, easier to read. Logically equivalent, as any compiler likely already determined.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -89,17 +89,14 @@ int
 PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
                      PyCompilerFlags *flags)
 {
-    PyObject *filename_obj;
+    PyObject *filename_obj = NULL;
     if (filename != NULL) {
         filename_obj = PyUnicode_DecodeFSDefault(filename);
         if (filename_obj == NULL) {
             PyErr_Print();
             return -1;
         }
     }
-    else {
-        filename_obj = NULL;
-    }
     int res = _PyRun_AnyFileObject(fp, filename_obj, closeit, flags);
     Py_XDECREF(filename_obj);
     return res;

Original file line number	Diff line number	Diff line change
`@@ -89,17 +89,14 @@ int`
`89`	`89`	`PyRun_AnyFileExFlags(FILE fp, const char filename, int closeit,`
`90`	`90`	`PyCompilerFlags *flags)`
`91`	`91`	`{`
`92`		`- PyObject *filename_obj;`
	`92`	`+ PyObject *filename_obj = NULL;`
`93`	`93`	`if (filename != NULL) {`
`94`	`94`	`filename_obj = PyUnicode_DecodeFSDefault(filename);`
`95`	`95`	`if (filename_obj == NULL) {`
`96`	`96`	`PyErr_Print();`
`97`	`97`	`return -1;`
`98`	`98`	`}`
`99`	`99`	`}`
`100`		`- else {`
`101`		`- filename_obj = NULL;`
`102`		`- }`
`103`	`100`	`int res = _PyRun_AnyFileObject(fp, filename_obj, closeit, flags);`
`104`	`101`	`Py_XDECREF(filename_obj);`
`105`	`102`	`return res;`