From: Brett Cannon <bcannon@gmail.com>
Date: Tue, 4 May 2010 00:30:17 +0000 (+0000)
Subject: Remove a redundant string length check and variable assignment.
X-Git-Tag: v2.7b2~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e894e93f4c5be0ab3a7c7cc59830723610599ad6;p=python

Remove a redundant string length check and variable assignment.

Found with Clang's static analyzer.
---

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index d89e8109e8..79eebcaa25 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -864,7 +864,7 @@ whichmodule(PyObject *global, PyObject *global_name)
 		*global_name_attr = 0, *name = 0;
 
 	module = PyObject_GetAttrString(global, "__module__");
-	if (module) 
+	if (module)
 		return module;
 	if (PyErr_ExceptionMatches(PyExc_AttributeError))
 		PyErr_Clear();
@@ -903,7 +903,6 @@ whichmodule(PyObject *global, PyObject *global_name)
 	   like this rule. jlf
 	*/
 	if (!j) {
-		j=1;
 		name=__main___str;
 	}
 
@@ -1235,9 +1234,6 @@ save_string(Picklerobject *self, PyObject *args, int doput)
 		int i;
 		char c_str[5];
 
-		if ((size = PyString_Size(args)) < 0)
-			return -1;
-
 		if (size < 256) {
 			c_str[0] = SHORT_BINSTRING;
 			c_str[1] = size;