Renamed *_set_version() functions to a more proper *_get_version() function names

Also changed dmiMAP_ParseMappingXML(...) to dmiMAP_ParseMappingXML_GroupName(...).  In the
dmidecode_get(...) function.  This is just a quick fix for making it compile.  It's also
needed to implement usage of dmiMAP_ParseMappingXML_TypeID(...) as well.

4 files changed, 15 insertions, 15 deletions

diff --git a/src/dmidecode.c b/src/dmidecode.c
index de6fb2a..11dbd50 100644
--- a/src/dmidecode.c
+++ b/src/dmidecode.c
@@ -5129,7 +5129,7 @@ int _smbios_decode_check(u8 * buf)
         return check;
 }
 
-xmlNode *smbios_decode_set_version(u8 * buf, const char *devmem)
+xmlNode *smbios_decode_get_version(u8 * buf, const char *devmem)
 {
         int check = _smbios_decode_check(buf);
 
@@ -5207,7 +5207,7 @@ int _legacy_decode_check(u8 * buf)
         return check;
 }
 
-xmlNode *legacy_decode_set_version(u8 * buf, const char *devmem)
+xmlNode *legacy_decode_get_version(u8 * buf, const char *devmem)
 {
         int check = _legacy_decode_check(buf);
 
diff --git a/src/dmidecode.h b/src/dmidecode.h
index 04d8f04..135c264 100644
--- a/src/dmidecode.h
+++ b/src/dmidecode.h
@@ -32,9 +32,9 @@ void dmi_dump(xmlNode *node, struct dmi_header * h);
 xmlNode *dmi_decode(xmlNode *parent_n, struct dmi_header * h, u16 ver);
 int address_from_efi(size_t * address);
 void to_dmi_header(struct dmi_header *h, u8 * data);
-xmlNode *smbios_decode_set_version(u8 * buf, const char *devmem);
+xmlNode *smbios_decode_get_version(u8 * buf, const char *devmem);
 int smbios_decode(u8 * buf, const char *devmem, xmlNode *xmlnode);
-xmlNode *legacy_decode_set_version(u8 * buf, const char *devmem);
+xmlNode *legacy_decode_get_version(u8 * buf, const char *devmem);
 int legacy_decode(u8 * buf, const char *devmem, xmlNode *xmlnode);
 
 const char *dmi_string(const struct dmi_header *dm, u8 s);
diff --git a/src/dmidecodemodule.c b/src/dmidecodemodule.c
index 6ed7fc5..2564236 100644
--- a/src/dmidecodemodule.c
+++ b/src/dmidecodemodule.c
@@ -115,7 +115,7 @@ u8 *parse_opt_type(u8 * p, const char *arg)
 }
 
 
-xmlNode *dmidecode_set_version()
+xmlNode *dmidecode_get_version()
 {
         int found = 0;
         size_t fp;
@@ -133,12 +133,12 @@ xmlNode *dmidecode_set_version()
                 //. printf("Reading SMBIOS/DMI data from file %s.\n", dumpfile);
                 if((buf = mem_chunk(0, 0x20, dumpfile)) != NULL) {
                         if(memcmp(buf, "_SM_", 4) == 0) {
-                                ver_n = smbios_decode_set_version(buf, dumpfile);
+                                ver_n = smbios_decode_get_version(buf, dumpfile);
                                 if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
                                         found++;
                                 }
                         } else if(memcmp(buf, "_DMI_", 5) == 0) {
-                                ver_n = legacy_decode_set_version(buf, dumpfile);
+                                ver_n = legacy_decode_get_version(buf, dumpfile);
                                 if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
                                         found++;
                                 }
@@ -152,13 +152,13 @@ xmlNode *dmidecode_set_version()
                         if((buf = mem_chunk(0xF0000, 0x10000, opt.devmem)) != NULL) {
                                 for(fp = 0; fp <= 0xFFF0; fp += 16) {
                                         if(memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) {
-                                                ver_n = smbios_decode_set_version(buf + fp, opt.devmem);
+                                                ver_n = smbios_decode_get_version(buf + fp, opt.devmem);
                                                 if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
                                                         found++;
                                                 }
                                                 fp += 16;
                                         } else if(memcmp(buf + fp, "_DMI_", 5) == 0) {
-                                                ver_n = legacy_decode_set_version (buf + fp, opt.devmem);
+                                                ver_n = legacy_decode_get_version (buf + fp, opt.devmem);
                                                 if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
                                                         found++;
                                                 }
@@ -170,7 +170,7 @@ xmlNode *dmidecode_set_version()
                 } else {
                         // Process as EFI
                         if((buf = mem_chunk(fp, 0x20, opt.devmem)) != NULL) {
-                                ver_n = smbios_decode_set_version(buf, opt.devmem);
+                                ver_n = smbios_decode_get_version(buf, opt.devmem);
                                 if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
                                         found++;
                                 }
@@ -293,7 +293,7 @@ static PyObject *dmidecode_get(const char *section)
                         assert( opt.mappingxml != NULL );
                 }
 
-                mapping = dmiMAP_ParseMappingXML(opt.mappingxml, section);
+                mapping = dmiMAP_ParseMappingXML_GroupName(opt.mappingxml, section);
                 if( mapping == NULL ) {
                         return NULL;
                 }
@@ -498,7 +498,7 @@ PyMODINIT_FUNC initdmidecode(void)
         Py_INCREF(version);
         PyModule_AddObject(module, "version", version);
 
-        opt.dmiversion_n = dmidecode_set_version();
+        opt.dmiversion_n = dmidecode_get_version();
         dmiver = dmixml_GetContent(opt.dmiversion_n);
         PyModule_AddObject(module, "dmi", dmiver ? PyString_FromString(dmiver) : Py_None);
 }
diff --git a/src/dmidecodemodule.h b/src/dmidecodemodule.h
index 34a2bad..0f5c75d 100644
--- a/src/dmidecodemodule.h
+++ b/src/dmidecodemodule.h
@@ -21,7 +21,7 @@
 
 #include "dmihelper.h"
 
-xmlNode *dmidecode_set_version(void);
+xmlNode *dmidecode_get_version(void);
 
 //extern void dmi_decode(struct dmi_header *h, u16 ver, PyObject* pydata);
 extern void dmi_dump(xmlNode *node, struct dmi_header *h);
@@ -31,8 +31,8 @@ extern void to_dmi_header(struct dmi_header *h, u8 * data);
 extern void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem);
 extern int smbios_decode(u8 * buf, const char *devmem, xmlNode *node);
 extern int legacy_decode(u8 * buf, const char *devmem, xmlNode *node);
-extern xmlNode *smbios_decode_set_version(u8 * buf, const char *devmem);
-extern xmlNode *legacy_decode_set_version(u8 * buf, const char *devmem);
+extern xmlNode *smbios_decode_get_version(u8 * buf, const char *devmem);
+extern xmlNode *legacy_decode_get_version(u8 * buf, const char *devmem);
 extern void *mem_chunk(size_t base, size_t len, const char *devmem);
 
 extern u8 *parse_opt_type(u8 * p, const char *arg);