From 610e544bf72c9e29f216af8ab23544ee6ae45b39 Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Thu, 6 Jan 2011 21:57:06 +0000 Subject: Further simplify gettmarg() --- Modules/timemodule.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'Modules') diff --git a/Modules/timemodule.c b/Modules/timemodule.c index d73b22bfcc..4b45f6e30d 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -297,34 +297,20 @@ static int gettmarg(PyObject *args, struct tm *p) { int y; - PyObject *t = NULL; memset((void *) p, '\0', sizeof(struct tm)); - if (PyTuple_Check(args)) { - t = args; - Py_INCREF(t); - } - else { + if (!PyTuple_Check(args)) { PyErr_SetString(PyExc_TypeError, "Tuple or struct_time argument required"); return 0; } - if (t == NULL || !PyArg_ParseTuple(t, "iiiiiiiii", - &y, - &p->tm_mon, - &p->tm_mday, - &p->tm_hour, - &p->tm_min, - &p->tm_sec, - &p->tm_wday, - &p->tm_yday, - &p->tm_isdst)) { - Py_XDECREF(t); + if (!PyArg_ParseTuple(args, "iiiiiiiii", + &y, &p->tm_mon, &p->tm_mday, + &p->tm_hour, &p->tm_min, &p->tm_sec, + &p->tm_wday, &p->tm_yday, &p->tm_isdst)) return 0; - } - Py_DECREF(t); /* XXX: Why 1900? If the goal is to interpret 2-digit years as those in * 20th / 21st century according to the POSIX standard, we can just treat -- cgit v1.2.1