[Python-checkins] python/dist/src/Objects object.c,2.177,2.178

[nnorwitz@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv7685/Objects

Modified Files:
	object.c 
Log Message:
SF # 561244 Micro optimizations

Cleanup code a bit and return as early as possible.


Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.177
retrieving revision 2.178
diff -C2 -d -r2.177 -r2.178
*** object.c	31 May 2002 20:23:33 -0000	2.177
--- object.c	13 Jun 2002 21:32:44 -0000	2.178
***************
*** 1436,1440 ****
  	int res;
  	if (v == Py_None)
! 		res = 0;
  	else if (v->ob_type->tp_as_number != NULL &&
  		 v->ob_type->tp_as_number->nb_nonzero != NULL)
--- 1436,1440 ----
  	int res;
  	if (v == Py_None)
! 		return 0;
  	else if (v->ob_type->tp_as_number != NULL &&
  		 v->ob_type->tp_as_number->nb_nonzero != NULL)
***************
*** 1447,1454 ****
  		res = (*v->ob_type->tp_as_sequence->sq_length)(v);
  	else
! 		res = 1;
! 	if (res > 0)
! 		res = 1;
! 	return res;
  }
  
--- 1447,1452 ----
  		res = (*v->ob_type->tp_as_sequence->sq_length)(v);
  	else
! 		return 1;
! 	return (res > 0) ? 1 : res;
  }