[Python-checkins] python/dist/src/Modules cPickle.c,2.113,2.114

[tim_one@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv10761/Modules

Modified Files:
	cPickle.c 
Log Message:
Minor cleanup, mostly adding horizontal whitespace, and breaking apart
embedded assignments, for readability.


Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.113
retrieving revision 2.114
diff -C2 -d -r2.113 -r2.114
*** cPickle.c	2 Feb 2003 17:59:11 -0000	2.113
--- cPickle.c	2 Feb 2003 18:08:34 -0000	2.114
***************
*** 2281,2313 ****
  
  	/* set up an array to hold get/put status */
! 	if ((lm=PyDict_Size(self->memo)) < 0) return NULL;
  	lm++;
! 	if (! (have_get=malloc((lm)*sizeof(char)))) return PyErr_NoMemory();
! 	memset(have_get,0,lm);
  
  	/* Scan for gets. */
! 	for (rsize=0, i=l; --i >= 0; ) {
! 		k=data->data[i];
  
! 		if (PyString_Check(k)) {
  			rsize += PyString_GET_SIZE(k);
- 		}
  
  		else if (PyInt_Check(k)) { /* put */
! 			ik=PyInt_AS_LONG((PyIntObject*)k);
! 			if (ik >= lm || ik==0) {
  				PyErr_SetString(PicklingError,
  						"Invalid get data");
  				return NULL;
  			}
! 			if (have_get[ik]) { /* with matching get */
! 				if (ik < 256) rsize += 2;
! 				else rsize+=5;
! 			}
  		}
  
  		else if (! (PyTuple_Check(k) &&
  			    PyTuple_GET_SIZE(k) == 2 &&
! 			    PyInt_Check((k=PyTuple_GET_ITEM(k,0))))
  			) {
  			PyErr_SetString(PicklingError,
--- 2281,2312 ----
  
  	/* set up an array to hold get/put status */
! 	lm = PyDict_Size(self->memo);
! 	if (lm < 0) return NULL;
  	lm++;
! 	have_get = malloc(lm);
! 	if (have_get == NULL) return PyErr_NoMemory();
! 	memset(have_get, 0, lm);
  
  	/* Scan for gets. */
! 	for (rsize = 0, i = l; --i >= 0; ) {
! 		k = data->data[i];
  
! 		if (PyString_Check(k))
  			rsize += PyString_GET_SIZE(k);
  
  		else if (PyInt_Check(k)) { /* put */
! 			ik = PyInt_AS_LONG((PyIntObject*)k);
! 			if (ik >= lm || ik == 0) {
  				PyErr_SetString(PicklingError,
  						"Invalid get data");
  				return NULL;
  			}
! 			if (have_get[ik]) /* with matching get */
! 				rsize += ik < 256 ? 2 : 5;
  		}
  
  		else if (! (PyTuple_Check(k) &&
  			    PyTuple_GET_SIZE(k) == 2 &&
! 			    PyInt_Check((k = PyTuple_GET_ITEM(k, 0))))
  			) {
  			PyErr_SetString(PicklingError,
***************
*** 2317,2350 ****
  
  		else { /* put */
! 			ik=PyInt_AS_LONG((PyIntObject*)k);
! 			if (ik >= lm || ik==0) {
  				PyErr_SetString(PicklingError,
  						"Invalid get data");
  				return NULL;
  			}
! 			have_get[ik]=1;
! 			if (ik < 256) rsize += 2;
! 			else rsize+=5;
  		}
- 
  	}
  
  	/* Now generate the result */
! 	if (!( r=PyString_FromStringAndSize(NULL,rsize)))  goto err;
! 	s=PyString_AS_STRING((PyStringObject*)r);
  
! 	for (i=0; i<l; i++) {
! 		k=data->data[i];
  
  		if (PyString_Check(k)) {
! 			ssize=PyString_GET_SIZE(k);
  			if (ssize) {
! 				p=PyString_AS_STRING((PyStringObject*)k);
! 				while (--ssize >= 0) *s++=*p++;
  			}
  		}
  
  		else if (PyTuple_Check(k)) { /* get */
! 			ik=PyInt_AS_LONG((PyIntObject*)PyTuple_GET_ITEM(k,0));
  			if (ik < 256) {
  				*s++ = BINGET;
--- 2316,2350 ----
  
  		else { /* put */
! 			ik = PyInt_AS_LONG((PyIntObject *)k);
! 			if (ik >= lm || ik == 0) {
  				PyErr_SetString(PicklingError,
  						"Invalid get data");
  				return NULL;
  			}
! 			have_get[ik] = 1;
! 			rsize += ik < 256 ? 2 : 5;
  		}
  	}
  
  	/* Now generate the result */
! 	r = PyString_FromStringAndSize(NULL, rsize);
! 	if (r == NULL) goto err;
! 	s = PyString_AS_STRING((PyStringObject *)r);
  
! 	for (i = 0; i < l; i++) {
! 		k = data->data[i];
  
  		if (PyString_Check(k)) {
! 			ssize = PyString_GET_SIZE(k);
  			if (ssize) {
! 				p=PyString_AS_STRING((PyStringObject *)k);
! 				while (--ssize >= 0)
! 					*s++ = *p++;
  			}
  		}
  
  		else if (PyTuple_Check(k)) { /* get */
! 			ik = PyInt_AS_LONG((PyIntObject *)
! 					    PyTuple_GET_ITEM(k, 0));
  			if (ik < 256) {
  				*s++ = BINGET;
***************
*** 2361,2365 ****
  
  		else { /* put */
! 			ik=PyInt_AS_LONG((PyIntObject*)k);
  
  			if (have_get[ik]) { /* with matching get */
--- 2361,2365 ----
  
  		else { /* put */
! 			ik = PyInt_AS_LONG((PyIntObject*)k);
  
  			if (have_get[ik]) { /* with matching get */
***************
*** 2377,2386 ****
  			}
  		}
- 
  	}
  
  	if (clear) {
  		PyDict_Clear(self->memo);
! 		Pdata_clear(data,0);
  	}
  
--- 2377,2385 ----
  			}
  		}
  	}
  
  	if (clear) {
  		PyDict_Clear(self->memo);
! 		Pdata_clear(data, 0);
  	}