From: oetiker Date: Tue, 22 Apr 2008 21:40:45 +0000 (+0000) Subject: fix for #148 X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=commitdiff_plain;h=f681f38ca91a2a1e2f7ce1265c924df9c9fecdfa;hp=ea8c705cc27ef33dee2cc6561ed51e16ddc5d0a9 fix for #148 git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1332 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/bindings/python/rrd_extra.h b/bindings/python/rrd_extra.h index 63c604d..2af673b 100644 --- a/bindings/python/rrd_extra.h +++ b/bindings/python/rrd_extra.h @@ -53,7 +53,6 @@ extern "C" { int rrd_open( char *file_name, - FILE ** in_file, rrd_t *rrd, int rdwr); int readfile( diff --git a/bindings/python/rrdtoolmodule.c b/bindings/python/rrdtoolmodule.c index 74b7fb0..fa96ebd 100644 --- a/bindings/python/rrdtoolmodule.c +++ b/bindings/python/rrdtoolmodule.c @@ -411,19 +411,17 @@ static PyObject *PyRRD_info( { PyObject *r, *t, *ds; rrd_t rrd; - FILE *in_file; char *filename; unsigned long i, j; if (!PyArg_ParseTuple(args, "s:info", &filename)) return NULL; - if (rrd_open(filename, &in_file, &rrd, RRD_READONLY) == -1) { + if (!rrd_open(filename, &rrd, RRD_READONLY) == -1) { PyErr_SetString(ErrorObject, rrd_get_error()); rrd_clear_error(); return NULL; } - fclose(in_file); #define DICTSET_STR(dict, name, value) \ t = PyString_FromString(value); \