Make new gcc -Wall happy

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 51752abc1312d1fc9f331d17b8d79dce505febaa..49517c5c264d399916faac7c48814484378cf5ec 100644 (file)
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -190,10 +190,12 @@ file_dealloc(f)
                (*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 @@ file_readlines(f, args)
                        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 be67259ce9884600f0b7ad0c2995b10b6725f6fd..d62dd08c190b14d1cbff2f79fc28277883c989e2 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -110,8 +110,9 @@ PyFunction_SetDefaults(op, defaults)
        }
        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 d95e86cf796c51311c8cc0efbf663ba7ec91cc32..becf1bc46548fa603152c52eacd55960d548b999 100644 (file)
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -497,7 +497,7 @@ PyLong_FromString(str, pend, base)
 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 5928128ce147fc3f122694e688a20cf4d3ee12b9..5e6a5a5938d70b8881b7a7a3a8f4ad2160844f95 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1016,14 +1016,16 @@ PyString_Format(format, args)
                                "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;
 }