MAINT: Simplify code path slightly

seberg · seberg · commit d02ca96090ea · 2020-10-22T15:09:01.000-05:00
diff --git a/numpy/core/src/multiarray/buffer.c b/numpy/core/src/multiarray/buffer.c
@@ -637,6 +637,8 @@ _buffer_get_info(PyObject *obj, int flags)
             item = PyList_GetItem(item_list, item_list_length - 1);
             old_info = (_buffer_info_t*)PyLong_AsVoidPtr(item);
             if (_buffer_info_cmp(info, old_info) != 0) {
+                old_info = NULL;  /* Can't use this one, but possibly next */
+
                 if (item_list_length > 1 && info->ndim > 1) {
                     /*
                      * Some arrays are C- and F-contiguous and if they have more
@@ -654,9 +656,6 @@ _buffer_get_info(PyObject *obj, int flags)
                         old_info = NULL;
                     }
                 }
-                else {
-                    old_info = NULL;
-                }
             }
 
             if (old_info != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -637,6 +637,8 @@ _buffer_get_info(PyObject *obj, int flags)`
`637`	`637`	`item = PyList_GetItem(item_list, item_list_length - 1);`
`638`	`638`	`old_info = (_buffer_info_t*)PyLong_AsVoidPtr(item);`
`639`	`639`	`if (_buffer_info_cmp(info, old_info) != 0) {`
	`640`	`+ old_info = NULL; /* Can't use this one, but possibly next */`
	`641`	`+`
`640`	`642`	`if (item_list_length > 1 && info->ndim > 1) {`
`641`	`643`	`/*`
`642`	`644`	`* Some arrays are C- and F-contiguous and if they have more`
`@@ -654,9 +656,6 @@ _buffer_get_info(PyObject *obj, int flags)`
`654`	`656`	`old_info = NULL;`
`655`	`657`	`}`
`656`	`658`	`}`
`657`		`- else {`
`658`		`- old_info = NULL;`
`659`		`- }`
`660`	`659`	`}`
`661`	`660`
`662`	`661`	`if (old_info != NULL) {`