[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20127] trunk/blender/source/gameengine/ Ketsji/KX_PythonSeq.cpp: remove unneeded vars and wasn' t returning on some errors

Campbell Barton ideasman42 at gmail.com
Sun May 10 17:23:21 CEST 2009


Revision: 20127
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20127
Author:   campbellbarton
Date:     2009-05-10 17:23:18 +0200 (Sun, 10 May 2009)

Log Message:
-----------
remove unneeded vars and wasn't returning on some errors

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp	2009-05-10 12:12:05 UTC (rev 20126)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp	2009-05-10 15:23:18 UTC (rev 20127)
@@ -52,7 +52,7 @@
 	PyObject_DEL( self );
 }
 
-static int KX_PythonSeq_len( KX_PythonSeq * self )
+static Py_ssize_t KX_PythonSeq_len( KX_PythonSeq * self )
 {
 	PyObjectPlus *self_plus= BGE_PROXY_REF(self->base);
 	 
@@ -85,14 +85,13 @@
 	 
 	if(self_plus==NULL) {
 		PyErr_SetString(PyExc_SystemError, BGE_PROXY_ERROR_MSG);
-		NULL;
+		return NULL;
 	}
 	
 	switch(self->type) {
 		case KX_PYGENSEQ_CONT_TYPE_SENSORS:
 		{
 			vector<SCA_ISensor*> linkedsensors = ((SCA_IController *)self_plus)->GetLinkedSensors();
-			SCA_ISensor* sensor;
 			if(index<0) index += linkedsensors.size();
 			if(index<0 || index>= linkedsensors.size()) {
 				PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range");
@@ -103,7 +102,6 @@
 		case KX_PYGENSEQ_CONT_TYPE_ACTUATORS:
 		{
 			vector<SCA_IActuator*> linkedactuators = ((SCA_IController *)self_plus)->GetLinkedActuators();
-			SCA_IActuator* sensor;
 			if(index<0) index += linkedactuators.size();
 			if(index<0 || index>= linkedactuators.size()) {
 				PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range");
@@ -114,7 +112,6 @@
 		case KX_PYGENSEQ_OB_TYPE_SENSORS:
 		{
 			SCA_SensorList& linkedsensors= ((KX_GameObject *)self_plus)->GetSensors();
-			SCA_ISensor *sensor;
 			if(index<0) index += linkedsensors.size();
 			if(index<0 || index>= linkedsensors.size()) {
 				PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range");
@@ -125,7 +122,6 @@
 		case KX_PYGENSEQ_OB_TYPE_CONTROLLERS:
 		{
 			SCA_ControllerList& linkedcontrollers= ((KX_GameObject *)self_plus)->GetControllers();
-			SCA_IController *controller;
 			if(index<0) index += linkedcontrollers.size();
 			if(index<0 || index>= linkedcontrollers.size()) {
 				PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range");
@@ -136,7 +132,6 @@
 		case KX_PYGENSEQ_OB_TYPE_ACTUATORS:
 		{
 			SCA_ActuatorList& linkedactuators= ((KX_GameObject *)self_plus)->GetActuators();
-			SCA_IActuator *actuator;
 			if(index<0) index += linkedactuators.size();
 			if(index<0 || index>= linkedactuators.size()) {
 				PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range");
@@ -145,6 +140,9 @@
 			return linkedactuators[index]->GetProxy();
 		}
 	}
+	
+	PyErr_SetString(PyExc_SystemError, "invalid sequence type, this is a bug");
+	return NULL;
 }
 
 
@@ -182,11 +180,11 @@
 		case KX_PYGENSEQ_CONT_TYPE_ACTUATORS:
 		{
 			vector<SCA_IActuator*> linkedactuators = ((SCA_IController *)self_plus)->GetLinkedActuators();
-			SCA_IActuator* sensor;
+			SCA_IActuator* actuator;
 			for (unsigned int index=0;index<linkedactuators.size();index++) {
-				sensor = linkedactuators[index];
-				if (sensor->GetName() == name)
-					return sensor->GetProxy();
+				actuator = linkedactuators[index];
+				if (actuator->GetName() == name)
+					return actuator->GetProxy();
 			}
 			break;
 		}
@@ -232,7 +230,7 @@
 static PyMappingMethods KX_PythonSeq_as_mapping = {
 	( inquiry ) KX_PythonSeq_len,	/* mp_length */
 	( binaryfunc ) KX_PythonSeq_subscript,	/* mp_subscript */
-	( objobjargproc ) 0,	/* mp_ass_subscript */
+	0,	/* mp_ass_subscript */
 };
 
 
@@ -244,7 +242,7 @@
 {
 	if(BGE_PROXY_REF(self->base)==NULL) {
 		PyErr_SetString(PyExc_SystemError, BGE_PROXY_ERROR_MSG);
-		NULL;
+		return NULL;
 	}
 	
 	/* create a new iterator if were alredy using this one */





More information about the Bf-blender-cvs mailing list