diff options
author | Guido van Rossum <guido@python.org> | 1993-06-17 12:35:49 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 1993-06-17 12:35:49 (GMT) |
commit | 234f942aefb779efa6cfb7225e21d16a3f7e80f7 (patch) | |
tree | 9c85e1ae919ebb44c0a1ca48bdfd11d5f60c7d9c /Modules/cdmodule.c | |
parent | 6a0e2282c359801bd70742642d24f7b0b74f5b4e (diff) | |
download | cpython-234f942aefb779efa6cfb7225e21d16a3f7e80f7.zip cpython-234f942aefb779efa6cfb7225e21d16a3f7e80f7.tar.gz cpython-234f942aefb779efa6cfb7225e21d16a3f7e80f7.tar.bz2 |
* Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c.
Added $(SYSDEF) to its build rule in Makefile.
* cgensupport.[ch], modsupport.[ch]: removed some old stuff. Also
changed files that still used it... And made several things static
that weren't but should have been... And other minor cleanups...
* listobject.[ch]: add external interfaces {set,get}listslice
* socketmodule.c: fix bugs in new send() argument parsing.
* sunaudiodevmodule.c: added flush() and close().
Diffstat (limited to 'Modules/cdmodule.c')
-rw-r--r-- | Modules/cdmodule.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/cdmodule.c b/Modules/cdmodule.c index 27cf35c..b5d0def 100644 --- a/Modules/cdmodule.c +++ b/Modules/cdmodule.c @@ -725,12 +725,12 @@ CD_addcallback(self, args) object *args; { int type; - object *funcobject, *funcargobject; + object *func, *funcarg; CheckParser(self); /* XXX - more work here */ - if (!getargs(args, "(iOO)", &type, &funcobject, &funcargobject)) + if (!getargs(args, "(iOO)", &type, &func, &funcarg)) return NULL; if (type < 0 || type >= NCALLBACKS) { @@ -744,11 +744,11 @@ CD_addcallback(self, args) CDsetcallback(self->ob_cdparser, (CDDATATYPES) type, CD_callback, (void *) self); #endif XDECREF(self->ob_cdcallbacks[type].ob_cdcallback); - INCREF(funcobject); - self->ob_cdcallbacks[type].ob_cdcallback = funcobject; + INCREF(func); + self->ob_cdcallbacks[type].ob_cdcallback = func; XDECREF(self->ob_cdcallbacks[type].ob_cdcallbackarg); - INCREF(funcargobject); - self->ob_cdcallbacks[type].ob_cdcallbackarg = funcargobject; + INCREF(funcarg); + self->ob_cdcallbacks[type].ob_cdcallbackarg = funcarg; INCREF(None); return None; |