[PATCH 1/2] Remove isys.getDeviceByToken since it is no longer used.

[Chris Lumens <clumens@xxxxxxxxxx>]

---
 isys/isys.c  |   19 -------------------
 isys/isys.py |    3 ---
 2 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/isys/isys.c b/isys/isys.c
index 65ee688..bd68f8f 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -127,7 +127,6 @@ static PyObject * doSegvHandler(PyObject *s, PyObject *args);
 static PyObject * doAuditDaemon(PyObject *s);
 static PyObject * doPrefixToNetmask(PyObject *s, PyObject *args);
 static PyObject * doGetBlkidData(PyObject * s, PyObject * args);
-static PyObject * doGetDeviceByToken(PyObject *s, PyObject *args);
 static PyObject * doIsCapsLockEnabled(PyObject * s, PyObject * args);
 static PyObject * doGetLinkStatus(PyObject * s, PyObject * args);
 
@@ -172,7 +171,6 @@ static PyMethodDef isysModuleMethods[] = {
     { "auditdaemon", (PyCFunction) doAuditDaemon, METH_NOARGS, NULL },
     { "prefix2netmask", (PyCFunction) doPrefixToNetmask, METH_VARARGS, NULL },
     { "getblkid", (PyCFunction) doGetBlkidData, METH_VARARGS, NULL },
-    { "getdevicebytoken", (PyCFunction) doGetDeviceByToken, METH_VARARGS, NULL },
     { "isCapsLockEnabled", (PyCFunction) doIsCapsLockEnabled, METH_VARARGS, NULL },
     { "getLinkStatus", (PyCFunction) doGetLinkStatus, METH_VARARGS, NULL },
     { NULL, NULL, 0, NULL }
@@ -796,23 +794,6 @@ static PyObject * doAuditDaemon(PyObject *s) {
     return Py_None;
 }
 
-static PyObject *doGetDeviceByToken(PyObject *s, PyObject *args) {
-    blkid_cache cache;
-    char *token, *value, *dev;
-
-    if (!PyArg_ParseTuple(args, "ss", &token, &value)) return NULL;
-
-    blkid_get_cache(&cache, NULL);
-
-    dev = blkid_get_devname(cache, token, value);
-    if (dev == NULL) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    } else {
-        return Py_BuildValue("s", dev);
-    }
-}
-
 static PyObject * doGetBlkidData(PyObject * s, PyObject * args) {
     char * dev, * key;
     blkid_cache cache;
diff --git a/isys/isys.py b/isys/isys.py
index 1f4f222..0963037 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -379,9 +379,6 @@ def compareNetDevices(first, second):
 def resetResolv():
     return _isys.resetresolv()
 
-def getDeviceByToken(token, value):
-    return _isys.getdevicebytoken(token, value)
-
 def readFSUuid(device):
     if not os.path.exists(device):
         device = "/dev/%s" % device
-- 
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list