Skip to content

Commit 788272f

Browse files
author
David Sommerseth
committed
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.
1 parent eb33e79 commit 788272f

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎src/dmidecode.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5129,7 +5129,7 @@ int _smbios_decode_check(u8 * buf)
51295129
return check;
51305130
}
51315131

5132-
xmlNode *smbios_decode_set_version(u8 * buf, const char *devmem)
5132+
xmlNode *smbios_decode_get_version(u8 * buf, const char *devmem)
51335133
{
51345134
int check = _smbios_decode_check(buf);
51355135

@@ -5207,7 +5207,7 @@ int _legacy_decode_check(u8 * buf)
52075207
return check;
52085208
}
52095209

5210-
xmlNode *legacy_decode_set_version(u8 * buf, const char *devmem)
5210+
xmlNode *legacy_decode_get_version(u8 * buf, const char *devmem)
52115211
{
52125212
int check = _legacy_decode_check(buf);
52135213

‎src/dmidecode.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ void dmi_dump(xmlNode *node, struct dmi_header * h);
3232
xmlNode *dmi_decode(xmlNode *parent_n, struct dmi_header * h, u16 ver);
3333
int address_from_efi(size_t * address);
3434
void to_dmi_header(struct dmi_header *h, u8 * data);
35-
xmlNode *smbios_decode_set_version(u8 * buf, const char *devmem);
35+
xmlNode *smbios_decode_get_version(u8 * buf, const char *devmem);
3636
int smbios_decode(u8 * buf, const char *devmem, xmlNode *xmlnode);
37-
xmlNode *legacy_decode_set_version(u8 * buf, const char *devmem);
37+
xmlNode *legacy_decode_get_version(u8 * buf, const char *devmem);
3838
int legacy_decode(u8 * buf, const char *devmem, xmlNode *xmlnode);
3939

4040
const char *dmi_string(const struct dmi_header *dm, u8 s);

‎src/dmidecodemodule.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ u8 *parse_opt_type(u8 * p, const char *arg)
115115
}
116116

117117

118-
xmlNode *dmidecode_set_version()
118+
xmlNode *dmidecode_get_version()
119119
{
120120
int found = 0;
121121
size_t fp;
@@ -133,12 +133,12 @@ xmlNode *dmidecode_set_version()
133133
//. printf("Reading SMBIOS/DMI data from file %s.\n", dumpfile);
134134
if((buf = mem_chunk(0, 0x20, dumpfile)) != NULL) {
135135
if(memcmp(buf, "_SM_", 4) == 0) {
136-
ver_n = smbios_decode_set_version(buf, dumpfile);
136+
ver_n = smbios_decode_get_version(buf, dumpfile);
137137
if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
138138
found++;
139139
}
140140
} else if(memcmp(buf, "_DMI_", 5) == 0) {
141-
ver_n = legacy_decode_set_version(buf, dumpfile);
141+
ver_n = legacy_decode_get_version(buf, dumpfile);
142142
if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
143143
found++;
144144
}
@@ -152,13 +152,13 @@ xmlNode *dmidecode_set_version()
152152
if((buf = mem_chunk(0xF0000, 0x10000, opt.devmem)) != NULL) {
153153
for(fp = 0; fp <= 0xFFF0; fp += 16) {
154154
if(memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) {
155-
ver_n = smbios_decode_set_version(buf + fp, opt.devmem);
155+
ver_n = smbios_decode_get_version(buf + fp, opt.devmem);
156156
if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
157157
found++;
158158
}
159159
fp += 16;
160160
} else if(memcmp(buf + fp, "_DMI_", 5) == 0) {
161-
ver_n = legacy_decode_set_version (buf + fp, opt.devmem);
161+
ver_n = legacy_decode_get_version (buf + fp, opt.devmem);
162162
if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
163163
found++;
164164
}
@@ -170,7 +170,7 @@ xmlNode *dmidecode_set_version()
170170
} else {
171171
// Process as EFI
172172
if((buf = mem_chunk(fp, 0x20, opt.devmem)) != NULL) {
173-
ver_n = smbios_decode_set_version(buf, opt.devmem);
173+
ver_n = smbios_decode_get_version(buf, opt.devmem);
174174
if( dmixml_GetAttrValue(ver_n, "unknown") == NULL ) {
175175
found++;
176176
}
@@ -293,7 +293,7 @@ static PyObject *dmidecode_get(const char *section)
293293
assert( opt.mappingxml != NULL );
294294
}
295295

296-
mapping = dmiMAP_ParseMappingXML(opt.mappingxml, section);
296+
mapping = dmiMAP_ParseMappingXML_GroupName(opt.mappingxml, section);
297297
if( mapping == NULL ) {
298298
return NULL;
299299
}
@@ -498,7 +498,7 @@ PyMODINIT_FUNC initdmidecode(void)
498498
Py_INCREF(version);
499499
PyModule_AddObject(module, "version", version);
500500

501-
opt.dmiversion_n = dmidecode_set_version();
501+
opt.dmiversion_n = dmidecode_get_version();
502502
dmiver = dmixml_GetContent(opt.dmiversion_n);
503503
PyModule_AddObject(module, "dmi", dmiver ? PyString_FromString(dmiver) : Py_None);
504504
}

‎src/dmidecodemodule.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "dmihelper.h"
2323

24-
xmlNode *dmidecode_set_version(void);
24+
xmlNode *dmidecode_get_version(void);
2525

2626
//extern void dmi_decode(struct dmi_header *h, u16 ver, PyObject* pydata);
2727
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);
3131
extern void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem);
3232
extern int smbios_decode(u8 * buf, const char *devmem, xmlNode *node);
3333
extern int legacy_decode(u8 * buf, const char *devmem, xmlNode *node);
34-
extern xmlNode *smbios_decode_set_version(u8 * buf, const char *devmem);
35-
extern xmlNode *legacy_decode_set_version(u8 * buf, const char *devmem);
34+
extern xmlNode *smbios_decode_get_version(u8 * buf, const char *devmem);
35+
extern xmlNode *legacy_decode_get_version(u8 * buf, const char *devmem);
3636
extern void *mem_chunk(size_t base, size_t len, const char *devmem);
3737

3838
extern u8 *parse_opt_type(u8 * p, const char *arg);

0 commit comments

Comments
 (0)