Turn rpmFdFromPyObject() into an object converter interface

- permits direct validation and conversion from arg parsing

1 files changed, 6 insertions, 3 deletions

diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c
index 2deb06793..868c293da 100644
--- a/python/rpmfd-py.c
+++ b/python/rpmfd-py.c
@@ -2,7 +2,7 @@
 #include "rpmsystem-py.h"
 #include "rpmfd-py.h"
 
-FD_t rpmFdFromPyObject(PyObject *obj)
+int rpmFdFromPyObject(PyObject *obj, FD_t *fdp)
 {
     FD_t fd = NULL;
 
@@ -13,10 +13,13 @@ FD_t rpmFdFromPyObject(PyObject *obj)
 	fd = fdDup(fileno(fp));
     } else {
 	PyErr_SetString(PyExc_TypeError, "integer or file object expected");
-	return NULL;
+	return 0;
     }
     if (fd == NULL || Ferror(fd)) {
 	PyErr_SetFromErrno(PyExc_IOError);
+	Fclose(fd);
+	return 0;
     }
-    return fd;
+    *fdp = fd;
+    return 1;
 }