diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dmidecode.c | 1 | ||||
| -rw-r--r-- | src/dmihelper.c | 117 | ||||
| -rw-r--r-- | src/dmihelper.h | 4 | ||||
| -rw-r--r-- | src/setup-dbg.py | 1 | ||||
| -rw-r--r-- | src/setup.py | 1 |
5 files changed, 0 insertions, 124 deletions
diff --git a/src/dmidecode.c b/src/dmidecode.c index 11dbd50..d2f340f 100644 --- a/src/dmidecode.c +++ b/src/dmidecode.c @@ -5004,7 +5004,6 @@ int dump(const char *dumpfile) free(buf); //. TODO: Exception - //dmiSetItem(pydata, "detect", "No SMBIOS nor DMI entry point found, sorry G."); if(!found) ret = -1; } diff --git a/src/dmihelper.c b/src/dmihelper.c deleted file mode 100644 index 4000a92..0000000 --- a/src/dmihelper.c +++ /dev/null @@ -1,117 +0,0 @@ -#include <stdio.h> -#include <strings.h> - -#include "dmihelper.h" - -/* -dmi_minor* dmiAppendObject(long code, char const *key, const char *format, ...) { - static dmi_minor* last = NULL; - - //. int minor = code&0x00FF; - //. int major = code>>8; - - va_list arg; - va_start(arg, format); - - dmi_minor *o = (dmi_minor *)malloc(sizeof(dmi_minor)); - o->next = last; - o->id = code; - o->major = (dmi_codes_major *)&dmiCodesMajor[map_maj[code>>8]]; - o->key = (char *)key; - - if((format != NULL)&&(vsnprintf(o->value, MAXVAL-1, format, arg) > MAXVAL)) { - free(o); - o = NULL; - //. TODO: Make this a python exception. - printf("dmidecode: Internal (python module) error; Value too long.\n"); - } - - last = o; - va_end(arg); // cleanup - - return o; -} -*/ - -int dmiSetItem(PyObject * dict, const char *key, const char *format, ...) -{ - va_list arg; - - va_start(arg, format); - char buffer[2048]; - - vsprintf(buffer, format, arg); - va_end(arg); - //printf("DEBUG: Setting k:%s, f:%s s:%s...", key, format, buffer); - PyDict_SetItem(dict, PyString_FromString(key), PyString_FromString(buffer)); - //printf("Done.\n"); - return 0; -} - -/* NOTE: Decomissioned helper function... -void dmiAppendData(PyObject *pydata, const int count) { - dmi_minor* last = dmiAppendObject(count, "JUNK", "NODATA"); - - const char *id = last->major->id; - PyObject *_key, *_val; - - PyObject *pymajor = PyDict_New(); - - _key = PyString_FromString("code"); - _val = PyInt_FromLong((long)last->major->code); - PyDict_SetItem(pymajor, _key, _val); - Py_DECREF(_key); - Py_DECREF(_val); - - _key = PyString_FromString("id"); - _val = PyString_FromString(last->major->id); - PyDict_SetItem(pymajor, _key, _val); - Py_DECREF(_key); - Py_DECREF(_val); - - _key = PyString_FromString("name"); - _val = PyString_FromString(last->major->desc); - PyDict_SetItem(pymajor, _key, _val); - Py_DECREF(_key); - Py_DECREF(_val); - - PyObject *pyminor = PyDict_New(); - while((last = last->next)) { - //printf("%d:<%s, %s> | %ld:[%s => %s]\n", last->major->code, last->major->id, last->major->desc, last->id, last->key, last->value); - _key = PyString_FromString(last->key); - _val = PyString_FromString(last->value); - PyDict_SetItem(pyminor, _key, _val); - Py_DECREF(_key); - Py_DECREF(_val); - } - _key = PyString_FromString("data"); - PyDict_SetItem(pymajor, _key, pyminor); - Py_DECREF(_key); - Py_DECREF(pyminor); - - _key = PyString_FromString(id); - PyDict_SetItem(pydata, _key, pymajor); - Py_DECREF(_key); - Py_DECREF(pymajor); -} -*/ - -/* NOTE: Decomissioned helper function... -int catsprintf(char *buf, const char *format, ...) { - if(format == NULL) { - bzero(buf, strlen(buf)); - return 0; - } - - va_list arg; // will point to each unnamed argument in turn - va_start(arg, format); // point to first element after fmt - - char b[8192]; - int c = vsprintf (b, format, arg); - - strcat(buf, b); - va_end(arg); // cleanp - - return c; -} -*/ diff --git a/src/dmihelper.h b/src/dmihelper.h index 82a936d..6dccd94 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -94,10 +94,6 @@ typedef struct _dmi_minor { struct _dmi_minor *next; } dmi_minor; -void dmiAppendData(PyObject * pydata, const int count); -int dmiSetItem(PyObject * dict, const char *key, const char *format, ...); - -//dmi_minor* dmiAppendObject(long code, char const *key, const char *format, ...); /*** dmiopt.h ***/ struct string_keyword { diff --git a/src/setup-dbg.py b/src/setup-dbg.py index e0a2358..95292e4 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -14,7 +14,6 @@ setup( "dmidecode", sources = [ "src/dmidecodemodule.c", - "src/dmihelper.c", "src/util.c", "src/dmioem.c", "src/dmidecode.c", diff --git a/src/setup.py b/src/setup.py index bb79a14..dd78087 100644 --- a/src/setup.py +++ b/src/setup.py @@ -14,7 +14,6 @@ setup( "dmidecode", sources = [ "src/dmidecodemodule.c", - "src/dmihelper.c", "src/util.c", "src/dmioem.c", "src/dmidecode.c", |