[Python-checkins] CVS: python/dist/src/Objects dictobject.c,2.60,2.61 unicodeobject.c,2.51,2.52

2000年7月22日 12:25:54 -0700

Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24717/Objects
Modified Files:
	dictobject.c unicodeobject.c 
Log Message:
Miscelaneous ANSIfications. I'm assuming here 'main' should take (int,
char**) and return an int even on PC platforms. If not, please fix
PC/utils/makesrc.c ;-P
Index: dictobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.60
retrieving revision 2.61
diff -C2 -r2.60 -r2.61
*** dictobject.c	2000年07月16日 12:04:31	2.60
--- dictobject.c	2000年07月22日 19:25:51	2.61
***************
*** 93,97 ****
 
 PyObject *
! PyDict_New()
 {
 	register dictobject *mp;
--- 93,97 ----
 
 PyObject *
! PyDict_New(void)
 {
 	register dictobject *mp;
Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.51
retrieving revision 2.52
diff -C2 -r2.51 -r2.52
*** unicodeobject.c	2000年07月17日 18:23:13	2.51
--- unicodeobject.c	2000年07月22日 19:25:51	2.52
***************
*** 555,559 ****
 }
 
! const char *PyUnicode_GetDefaultEncoding()
 {
 return unicode_default_encoding;
--- 555,559 ----
 }
 
! const char *PyUnicode_GetDefaultEncoding(void)
 {
 return unicode_default_encoding;
***************
*** 4531,4538 ****
 
 static PyObject *
! getnextarg(args, arglen, p_argidx)
! PyObject *args;
! int arglen;
! int *p_argidx;
 {
 int argidx = *p_argidx;
--- 4531,4535 ----
 
 static PyObject *
! getnextarg(PyObject *args, int arglen, int *p_argidx)
 {
 int argidx = *p_argidx;
***************
*** 4556,4564 ****
 
 static
- #ifdef HAVE_STDARG_PROTOTYPES
 int usprintf(register Py_UNICODE *buffer, char *format, ...)
- #else
- int usprintf(va_alist) va_dcl
- #endif
 {
 register int i;
--- 4553,4557 ----
***************
*** 4566,4579 ****
 va_list va;
 char *charbuffer;
- #ifdef HAVE_STDARG_PROTOTYPES
 va_start(va, format);
- #else
- Py_UNICODE *args;
- char *format;
- 	
- va_start(va);
- buffer = va_arg(va, Py_UNICODE *);
- format = va_arg(va, char *);
- #endif
 
 /* First, format the string as char array, then expand to Py_UNICODE
--- 4559,4563 ----
***************
*** 5122,5126 ****
 /* Initialize the Unicode implementation */
 
! void _PyUnicode_Init()
 {
 /* Doublecheck the configuration... */
--- 5106,5110 ----
 /* Initialize the Unicode implementation */
 
! void _PyUnicode_Init(void)
 {
 /* Doublecheck the configuration... */
***************
*** 5139,5143 ****
 
 void
! _PyUnicode_Fini()
 {
 PyUnicodeObject *u = unicode_freelist;
--- 5123,5127 ----
 
 void
! _PyUnicode_Fini(void)
 {
 PyUnicodeObject *u = unicode_freelist;