[Python-checkins] CVS: python/dist/src/Modules _localemodule.c,2.7,2.8

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/clean/Modules

Modified Files:
	_localemodule.c 
Log Message:
Vladimir Marangozov:

Change Py_Malloc/Realloc/Free calls to PyMem_Malloc/Realloc/Free +
PyErr_Nomemory on error check.  Py_Malloc c.s. are obsolete.


Index: _localemodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** _localemodule.c	2000/02/29 13:59:22	2.7
--- _localemodule.c	2000/05/03 22:30:13	2.8
***************
*** 288,302 ****
    /* assume no change in size, first */
    n1=strlen(s)+1;
!   buf=Py_Malloc(n1);
!   if(!buf)return NULL;
    n2=strxfrm(buf,s,n1);
    if(n2>n1){
      /* more space needed */
!     buf=Py_Realloc(buf,n2);
!     if(!buf)return NULL;
      strxfrm(buf,s,n2);
    }
    result=PyString_FromString(buf);
!   Py_Free(buf);
    return result;
  }
--- 288,302 ----
    /* assume no change in size, first */
    n1=strlen(s)+1;
!   buf=PyMem_Malloc(n1);
!   if(!buf)return PyErr_NoMemory();
    n2=strxfrm(buf,s,n1);
    if(n2>n1){
      /* more space needed */
!     buf=PyMem_Realloc(buf,n2);
!     if(!buf)return PyErr_NoMemory();
      strxfrm(buf,s,n2);
    }
    result=PyString_FromString(buf);
!   PyMem_Free(buf);
    return result;
  }