Make fiFromHeader() static inside header-py, deprecate

diff --git a/python/header-py.c b/python/header-py.c
index 821d1f9..21a10bb 100644 (file)
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -289,6 +289,13 @@ static PyObject *hdrConvert(hdrObject *self, PyObject *args, PyObject *kwds)
     return PyBool_FromLong(headerConvert(self->h, op));
 }
 
+static PyObject * hdr_fiFromHeader(PyObject * s, PyObject * args, PyObject * kwds)
+{
+    DEPRECATED_METHOD;
+    return PyObject_Call((PyObject *) &rpmfi_Type,
+                        Py_BuildValue("(O)", s), kwds);
+}
+
 static int hdr_compare(hdrObject * a, hdrObject * b)
 {
     return rpmVersionCompare(a->h, b->h);

diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index ce3c3be..72582b9 100644 (file)
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -417,8 +417,3 @@ PyObject * rpmfi_Wrap(rpmfi fi)
     return (PyObject *) s;
 }
 
-PyObject * hdr_fiFromHeader(PyObject * s, PyObject * args, PyObject * kwds)
-{
-    return PyObject_Call((PyObject *) &rpmfi_Type,
-                        Py_BuildValue("(O)", s), kwds);
-}

diff --git a/python/rpmfi-py.h b/python/rpmfi-py.h
index faa292b..8029acd 100644 (file)
--- a/python/rpmfi-py.h
+++ b/python/rpmfi-py.h
@@ -13,6 +13,4 @@ rpmfi fiFromFi(rpmfiObject * fi);
 
 PyObject * rpmfi_Wrap(rpmfi fi);
 
-PyObject * hdr_fiFromHeader(PyObject * s, PyObject * args, PyObject * kwds);
-
 #endif