[Python-checkins] CVS: python/dist/src/Modules _tkinter.c,1.104,1.105 md5module.c,2.17,2.18 parsermodule.c,2.44,2.45 svmodule.c,2.14,2.15
Peter Schneider-Kamp
python-dev@python.org
Mon, 10 Jul 2000 05:44:01 -0700
- Previous message: [Python-checkins] CVS: python/dist/src/Modules selectmodule.c,2.35,2.36 sgimodule.c,1.13,1.14 structmodule.c,2.34,2.35 syslogmodule.c,2.13,2.14
- Next message: [Python-checkins] CVS: python/dist/src/Modules regexmodule.c,1.36,1.37 regexpr.c,1.30,1.31 rotormodule.c,2.24,2.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22008
Modified Files:
_tkinter.c md5module.c parsermodule.c svmodule.c
Log Message:
ANSI-fying
added excplicit node * parameter to termvalid argument in
validate_two_chain_ops of parsermodule.c (as proposed by fred)
Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** _tkinter.c 2000/07/08 04:04:38 1.104
--- _tkinter.c 2000/07/10 12:43:58 1.105
***************
*** 266,270 ****
/* XXX Too bad if you don't have select(). */
struct timeval t;
- double frac;
t.tv_sec = milli/1000;
t.tv_usec = (milli%1000) * 1000;
--- 266,269 ----
***************
*** 1504,1508 ****
{
PyObject *file;
- FileHandler_ClientData *data;
int tfile;
--- 1503,1506 ----
Index: md5module.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/md5module.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** md5module.c 2000/06/30 23:58:05 2.17
--- md5module.c 2000/07/10 12:43:58 2.18
***************
*** 48,53 ****
static void
! md5_dealloc(md5p)
! md5object *md5p;
{
PyObject_Del(md5p);
--- 48,52 ----
static void
! md5_dealloc(md5object *md5p)
{
PyObject_Del(md5p);
***************
*** 58,64 ****
static PyObject *
! md5_update(self, args)
! md5object *self;
! PyObject *args;
{
unsigned char *cp;
--- 57,61 ----
static PyObject *
! md5_update(md5object *self, PyObject *args)
{
unsigned char *cp;
***************
*** 83,89 ****
static PyObject *
! md5_digest(self, args)
! md5object *self;
! PyObject *args;
{
--- 80,84 ----
static PyObject *
! md5_digest(md5object *self, PyObject *args)
{
***************
*** 110,116 ****
static PyObject *
! md5_copy(self, args)
! md5object *self;
! PyObject *args;
{
md5object *md5p;
--- 105,109 ----
static PyObject *
! md5_copy(md5object *self, PyObject *args)
{
md5object *md5p;
***************
*** 141,147 ****
static PyObject *
! md5_getattr(self, name)
! md5object *self;
! char *name;
{
return Py_FindMethod(md5_methods, (PyObject *)self, name);
--- 134,138 ----
static PyObject *
! md5_getattr(md5object *self, char *name)
{
return Py_FindMethod(md5_methods, (PyObject *)self, name);
***************
*** 209,215 ****
static PyObject *
! MD5_new(self, args)
! PyObject *self;
! PyObject *args;
{
md5object *md5p;
--- 200,204 ----
static PyObject *
! MD5_new(PyObject *self, PyObject *args)
{
md5object *md5p;
Index: parsermodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/parsermodule.c,v
retrieving revision 2.44
retrieving revision 2.45
diff -C2 -r2.44 -r2.45
*** parsermodule.c 2000/07/09 14:36:13 2.44
--- parsermodule.c 2000/07/10 12:43:58 2.45
***************
*** 478,484 ****
static PyObject*
! parser_getattr(self, name)
! PyObject *self;
! char *name;
{
return (Py_FindMethod(parser_methods, self, name));
--- 478,482 ----
static PyObject*
! parser_getattr(PyObject *self, char *name)
{
return (Py_FindMethod(parser_methods, self, name));
***************
*** 492,497 ****
*/
static void
! err_string(message)
! char *message;
{
PyErr_SetString(parser_error, message);
--- 490,494 ----
*/
static void
! err_string(char *message)
{
PyErr_SetString(parser_error, message);
***************
*** 1633,1638 ****
*/
static int
! validate_try(tree)
! node *tree;
{
int nch = NCH(tree);
--- 1630,1634 ----
*/
static int
! validate_try(node *tree)
{
int nch = NCH(tree);
***************
*** 1883,1891 ****
static int
! validate_chain_two_ops(tree, termvalid, op1, op2)
! node *tree;
! int (*termvalid)();
! int op1;
! int op2;
{
int pos = 1;
--- 1879,1883 ----
static int
! validate_chain_two_ops(node *tree, int (*termvalid)(node *), int op1, int op2)
{
int pos = 1;
Index: svmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/svmodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** svmodule.c 2000/07/09 03:09:56 2.14
--- svmodule.c 2000/07/10 12:43:58 2.15
***************
*** 49,57 ****
static PyObject *
! svc_conversion(self, args, function, factor)
! captureobject *self;
! PyObject *args;
! void (*function)();
! float factor;
{
PyObject *output;
--- 49,53 ----
static PyObject *
! svc_conversion(captureobject *self, PyObject *args, void (*function)(), float factor)
{
PyObject *output;
***************
*** 85,91 ****
*/
static PyObject *
! svc_YUVtoYUV422DC(self, args)
! captureobject *self;
! PyObject *args;
{
if (self->ob_info.format != SV_YUV411_FRAMES) {
--- 81,85 ----
*/
static PyObject *
! svc_YUVtoYUV422DC(captureobject *self, PyObject *args)
{
if (self->ob_info.format != SV_YUV411_FRAMES) {
***************
*** 97,103 ****
static PyObject *
! svc_YUVtoYUV422DC_quarter(self, args)
! captureobject *self;
! PyObject *args;
{
if (self->ob_info.format != SV_YUV411_FRAMES) {
--- 91,95 ----
static PyObject *
! svc_YUVtoYUV422DC_quarter(captureobject *self, PyObject *args)
{
if (self->ob_info.format != SV_YUV411_FRAMES) {
***************
*** 110,116 ****
static PyObject *
! svc_YUVtoYUV422DC_sixteenth(self, args)
! captureobject *self;
! PyObject *args;
{
if (self->ob_info.format != SV_YUV411_FRAMES) {
--- 102,106 ----
static PyObject *
! svc_YUVtoYUV422DC_sixteenth(captureobject *self, PyObject *args)
{
if (self->ob_info.format != SV_YUV411_FRAMES) {
***************
*** 123,129 ****
static PyObject *
! svc_YUVtoRGB(self, args)
! captureobject *self;
! PyObject *args;
{
switch (self->ob_info.format) {
--- 113,117 ----
static PyObject *
! svc_YUVtoRGB(captureobject *self, PyObject *args)
{
switch (self->ob_info.format) {
***************
*** 139,145 ****
static PyObject *
! svc_RGB8toRGB32(self, args)
! captureobject *self;
! PyObject *args;
{
if (self->ob_info.format != SV_RGB8_FRAMES) {
--- 127,131 ----
static PyObject *
! svc_RGB8toRGB32(captureobject *self, PyObject *args)
{
if (self->ob_info.format != SV_RGB8_FRAMES) {
***************
*** 151,157 ****
static PyObject *
! svc_InterleaveFields(self, args)
! captureobject *self;
! PyObject *args;
{
if (self->ob_info.format != SV_RGB8_FRAMES) {
--- 137,141 ----
static PyObject *
! svc_InterleaveFields(captureobject *self, PyObject *args)
{
if (self->ob_info.format != SV_RGB8_FRAMES) {
***************
*** 163,169 ****
static PyObject *
! svc_GetFields(self, args)
! captureobject *self;
! PyObject *args;
{
PyObject *f1 = NULL;
--- 147,151 ----
static PyObject *
! svc_GetFields(captureobject *self, PyObject *args)
{
PyObject *f1 = NULL;
***************
*** 195,201 ****
static PyObject *
! svc_UnlockCaptureData(self, args)
! captureobject *self;
! PyObject *args;
{
if (!PyArg_Parse(args, ""))
--- 177,181 ----
static PyObject *
! svc_UnlockCaptureData(captureobject *self, PyObject *args)
{
if (!PyArg_Parse(args, ""))
***************
*** 220,226 ****
static PyObject *
! svc_lrectwrite(self, args)
! captureobject *self;
! PyObject *args;
{
Screencoord x1, x2, y1, y2;
--- 200,204 ----
static PyObject *
! svc_lrectwrite(captureobject *self, PyObject *args)
{
Screencoord x1, x2, y1, y2;
***************
*** 237,243 ****
static PyObject *
! svc_writefile(self, args)
! captureobject *self;
! PyObject *args;
{
PyObject *file;
--- 215,219 ----
static PyObject *
! svc_writefile(captureobject *self, PyObject *args)
{
PyObject *file;
***************
*** 268,274 ****
static PyObject *
! svc_FindVisibleRegion(self, args)
! captureobject *self;
! PyObject *args;
{
void *visible;
--- 244,248 ----
static PyObject *
! svc_FindVisibleRegion(captureobject *self, PyObject *args)
{
void *visible;
***************
*** 309,314 ****
static void
! capture_dealloc(self)
! captureobject *self;
{
if (self->ob_capture != NULL) {
--- 283,287 ----
static void
! capture_dealloc(captureobject *self)
{
if (self->ob_capture != NULL) {
***************
*** 324,330 ****
static PyObject *
! capture_getattr(self, name)
! svobject *self;
! char *name;
{
return Py_FindMethod(capture_methods, (PyObject *)self, name);
--- 297,301 ----
static PyObject *
! capture_getattr(svobject *self, char *name)
{
return Py_FindMethod(capture_methods, (PyObject *)self, name);
***************
*** 347,354 ****
static PyObject *
! newcaptureobject(self, ptr, mustunlock)
! svobject *self;
! void *ptr;
! int mustunlock;
{
captureobject *p;
--- 318,322 ----
static PyObject *
! newcaptureobject(svobject *self, void *ptr, int mustunlock)
{
captureobject *p;
***************
*** 366,372 ****
static PyObject *
! sv_GetCaptureData(self, args)
! svobject *self;
! PyObject *args;
{
void *ptr;
--- 334,338 ----
static PyObject *
! sv_GetCaptureData(svobject *self, PyObject *args)
{
void *ptr;
***************
*** 394,400 ****
static PyObject *
! sv_BindGLWindow(self, args)
! svobject *self;
! PyObject *args;
{
long wid;
--- 360,364 ----
static PyObject *
! sv_BindGLWindow(svobject *self, PyObject *args)
{
long wid;
***************
*** 412,418 ****
static PyObject *
! sv_EndContinuousCapture(self, args)
! svobject *self;
! PyObject *args;
{
--- 376,380 ----
static PyObject *
! sv_EndContinuousCapture(svobject *self, PyObject *args)
{
***************
*** 428,434 ****
static PyObject *
! sv_IsVideoDisplayed(self, args)
! svobject *self;
! PyObject *args;
{
int v;
--- 390,394 ----
static PyObject *
! sv_IsVideoDisplayed(svobject *self, PyObject *args)
{
int v;
***************
*** 445,451 ****
static PyObject *
! sv_OutputOffset(self, args)
! svobject *self;
! PyObject *args;
{
int x_offset;
--- 405,409 ----
static PyObject *
! sv_OutputOffset(svobject *self, PyObject *args)
{
int x_offset;
***************
*** 463,469 ****
static PyObject *
! sv_PutFrame(self, args)
! svobject *self;
! PyObject *args;
{
char *buffer;
--- 421,425 ----
static PyObject *
! sv_PutFrame(svobject *self, PyObject *args)
{
char *buffer;
***************
*** 480,486 ****
static PyObject *
! sv_QuerySize(self, args)
! svobject *self;
! PyObject *args;
{
int w;
--- 436,440 ----
static PyObject *
! sv_QuerySize(svobject *self, PyObject *args)
{
int w;
***************
*** 499,505 ****
static PyObject *
! sv_SetSize(self, args)
! svobject *self;
! PyObject *args;
{
int w;
--- 453,457 ----
static PyObject *
! sv_SetSize(svobject *self, PyObject *args)
{
int w;
***************
*** 517,523 ****
static PyObject *
! sv_SetStdDefaults(self, args)
! svobject *self;
! PyObject *args;
{
--- 469,473 ----
static PyObject *
! sv_SetStdDefaults(svobject *self, PyObject *args)
{
***************
*** 533,539 ****
static PyObject *
! sv_UseExclusive(self, args)
! svobject *self;
! PyObject *args;
{
boolean onoff;
--- 483,487 ----
static PyObject *
! sv_UseExclusive(svobject *self, PyObject *args)
{
boolean onoff;
***************
*** 551,557 ****
static PyObject *
! sv_WindowOffset(self, args)
! svobject *self;
! PyObject *args;
{
int x_offset;
--- 499,503 ----
static PyObject *
! sv_WindowOffset(svobject *self, PyObject *args)
{
int x_offset;
***************
*** 569,575 ****
static PyObject *
! sv_CaptureBurst(self, args)
! svobject *self;
! PyObject *args;
{
int bytes, i;
--- 515,519 ----
static PyObject *
! sv_CaptureBurst(svobject *self, PyObject *args)
{
int bytes, i;
***************
*** 662,668 ****
static PyObject *
! sv_CaptureOneFrame(self, args)
! svobject *self;
! PyObject *args;
{
svCaptureInfo info;
--- 606,610 ----
static PyObject *
! sv_CaptureOneFrame(svobject *self, PyObject *args)
{
svCaptureInfo info;
***************
*** 704,710 ****
static PyObject *
! sv_InitContinuousCapture(self, args)
! svobject *self;
! PyObject *args;
{
svCaptureInfo info;
--- 646,650 ----
static PyObject *
! sv_InitContinuousCapture(svobject *self, PyObject *args)
{
svCaptureInfo info;
***************
*** 725,731 ****
static PyObject *
! sv_LoadMap(self, args)
! svobject *self;
! PyObject *args;
{
PyObject *rgb;
--- 665,669 ----
static PyObject *
! sv_LoadMap(svobject *self, PyObject *args)
{
PyObject *rgb;
***************
*** 788,794 ****
static PyObject *
! sv_CloseVideo(self, args)
! svobject *self;
! PyObject *args;
{
if (!PyArg_Parse(args, ""))
--- 726,730 ----
static PyObject *
! sv_CloseVideo(svobject *self, PyObject *args)
{
if (!PyArg_Parse(args, ""))
***************
*** 804,812 ****
static PyObject *
! doParams(self, args, func, modified)
! svobject *self;
! PyObject *args;
! int (*func)(SV_nodeP, long *, int);
! int modified;
{
PyObject *list;
--- 740,745 ----
static PyObject *
! doParams(svobject *self, PyObject *args,
! int (*func)(SV_nodeP, long *, int), int modified)
{
PyObject *list;
***************
*** 870,875 ****
static PyObject *
! sv_GetParam(self, args)
! PyObject *self, *args;
{
return doParams(self, args, svGetParam, 1);
--- 803,807 ----
static PyObject *
! sv_GetParam(PyObject *self, PyObject *args)
{
return doParams(self, args, svGetParam, 1);
***************
*** 877,882 ****
static PyObject *
! sv_GetParamRange(self, args)
! PyObject *self, *args;
{
return doParams(self, args, svGetParamRange, 1);
--- 809,813 ----
static PyObject *
! sv_GetParamRange(PyObject *self, PyObject *args)
{
return doParams(self, args, svGetParamRange, 1);
***************
*** 884,889 ****
static PyObject *
! sv_SetParam(self, args)
! PyObject *self, *args;
{
return doParams(self, args, svSetParam, 0);
--- 815,819 ----
static PyObject *
! sv_SetParam(PyObject *self, PyObject *args)
{
return doParams(self, args, svSetParam, 0);
***************
*** 914,922 ****
static PyObject *
! sv_conversion(self, args, function, inputfactor, factor)
! PyObject *self, *args;
! void (*function)();
! int inputfactor;
! float factor;
{
int invert, width, height, inputlength;
--- 844,849 ----
static PyObject *
! sv_conversion(PyObject *self, PyObject *args, void (*function)(),
! int inputfactor, float factor)
{
int invert, width, height, inputlength;
***************
*** 948,953 ****
static PyObject *
! sv_InterleaveFields(self, args)
! PyObject *self, *args;
{
return sv_conversion(self, args, svInterleaveFields, 1, 1.0);
--- 875,879 ----
static PyObject *
! sv_InterleaveFields(PyObject *self, PyObject *args)
{
return sv_conversion(self, args, svInterleaveFields, 1, 1.0);
***************
*** 955,960 ****
static PyObject *
! sv_RGB8toRGB32(self, args)
! PyObject *self, *args;
{
return sv_conversion(self, args, svRGB8toRGB32, 1, (float) sizeof(long));
--- 881,885 ----
static PyObject *
! sv_RGB8toRGB32(PyObject *self, PyObject *args)
{
return sv_conversion(self, args, svRGB8toRGB32, 1, (float) sizeof(long));
***************
*** 962,967 ****
static PyObject *
! sv_YUVtoRGB(self, args)
! PyObject *self, *args;
{
return sv_conversion(self, args, svYUVtoRGB, 2, (float) sizeof(long));
--- 887,891 ----
static PyObject *
! sv_YUVtoRGB(PyObject *self, PyObject *args)
{
return sv_conversion(self, args, svYUVtoRGB, 2, (float) sizeof(long));
***************
*** 969,974 ****
static void
! svideo_dealloc(self)
! svobject *self;
{
if (self->ob_svideo != NULL)
--- 893,897 ----
static void
! svideo_dealloc(svobject *self)
{
if (self->ob_svideo != NULL)
***************
*** 978,984 ****
static PyObject *
! svideo_getattr(self, name)
! svobject *self;
! char *name;
{
return Py_FindMethod(svideo_methods, (PyObject *)self, name);
--- 901,905 ----
static PyObject *
! svideo_getattr(svobject *self, char *name)
{
return Py_FindMethod(svideo_methods, (PyObject *)self, name);
***************
*** 1001,1006 ****
static PyObject *
! newsvobject(svp)
! SV_nodeP svp;
{
svobject *p;
--- 922,926 ----
static PyObject *
! newsvobject(SV_nodeP svp)
{
svobject *p;
***************
*** 1019,1024 ****
static PyObject *
! sv_OpenVideo(self, args)
! PyObject *self, *args;
{
SV_nodeP svp;
--- 939,943 ----
static PyObject *
! sv_OpenVideo(PyObject *self, PyObject *args)
{
SV_nodeP svp;
- Previous message: [Python-checkins] CVS: python/dist/src/Modules selectmodule.c,2.35,2.36 sgimodule.c,1.13,1.14 structmodule.c,2.34,2.35 syslogmodule.c,2.13,2.14
- Next message: [Python-checkins] CVS: python/dist/src/Modules regexmodule.c,1.36,1.37 regexpr.c,1.30,1.31 rotormodule.c,2.24,2.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]