Make new gcc -Wall happy

gvanrossum · gvanrossum · commit 1109fbca76d0 · 1998-04-10T22:16:39.000Z
diff --git 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
@@ -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
@@ -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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -190,10 +190,12 @@ file_dealloc(f)`
`190`	`190`	`(*f->f_close)(f->f_fp);`
`191`	`191`	`Py_END_ALLOW_THREADS`
`192`	`192`	`}`
`193`		`- if (f->f_name != NULL)`
	`193`	`+ if (f->f_name != NULL) {`
`194`	`194`	`Py_DECREF(f->f_name);`
`195`		`- if (f->f_mode != NULL)`
	`195`	`+ }`
	`196`	`+ if (f->f_mode != NULL) {`
`196`	`197`	`Py_DECREF(f->f_mode);`
	`198`	`+ }`
`197`	`199`	`free((char *)f);`
`198`	`200`	`}`
`199`	`201`
`@@ -771,8 +773,9 @@ file_readlines(f, args)`
`771`	`773`	`goto error;`
`772`	`774`	`}`
`773`	`775`	`cleanup:`
`774`		`- if (big_buffer)`
	`776`	`+ if (big_buffer) {`
`775`	`777`	`Py_DECREF(big_buffer);`
	`778`	`+ }`
`776`	`779`	`return list;`
`777`	`780`	`}`
`778`	`781`