Make new gcc -Wall happy
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 51752abc..49517c5 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -190,10 +190,12 @@
(*f->f_close)(f->f_fp);
Py_END_ALLOW_THREADS
}
- if (f->f_name != NULL)
+ if (f->f_name != NULL) {
Py_DECREF(f->f_name);
- if (f->f_mode != NULL)
+ }
+ if (f->f_mode != NULL) {
Py_DECREF(f->f_mode);
+ }
free((char *)f);
}
@@ -771,8 +773,9 @@
goto error;
}
cleanup:
- if (big_buffer)
+ if (big_buffer) {
Py_DECREF(big_buffer);
+ }
return list;
}
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index be67259..d62dd08 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -110,8 +110,9 @@
}
if (defaults == Py_None)
defaults = NULL;
- else if (PyTuple_Check(defaults))
+ else if (PyTuple_Check(defaults)) {
Py_XINCREF(defaults);
+ }
else {
PyErr_SetString(PyExc_SystemError, "non-tuple default args");
return -1;
diff --git a/Objects/longobject.c b/Objects/longobject.c
index d95e86c..becf1bc 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -497,7 +497,7 @@
static PyLongObject *x_divrem
Py_PROTO((PyLongObject *, PyLongObject *, PyLongObject **));
static PyObject *long_pos Py_PROTO((PyLongObject *));
-static long_divrem Py_PROTO((PyLongObject *, PyLongObject *,
+static int long_divrem Py_PROTO((PyLongObject *, PyLongObject *,
PyLongObject **, PyLongObject **));
/* Long division with remainder, top-level routine */
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 5928128..5e6a5a5 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1016,14 +1016,16 @@
"not all arguments converted");
goto error;
}
- if (args_owned)
+ if (args_owned) {
Py_DECREF(args);
+ }
_PyString_Resize(&result, reslen - rescnt);
return result;
error:
Py_DECREF(result);
- if (args_owned)
+ if (args_owned) {
Py_DECREF(args);
+ }
return NULL;
}