diff options
| author | Nima Talebi <nima@autonomy.net.au> | 2009-06-05 01:42:07 +1000 |
|---|---|---|
| committer | Nima Talebi <nima@autonomy.net.au> | 2009-06-05 01:42:07 +1000 |
| commit | 2cf4f28f6fc671478003b31c03b93e070eee9942 (patch) | |
| tree | b9d956cc1241852d88b03c3af54ae6cd99733b76 /src/dmidecodemodule.c | |
| parent | adc4191973b177f557d9a851d558d09cde841efe (diff) | |
| download | python-dmidecode-2cf4f28f6fc671478003b31c03b93e070eee9942.tar.gz python-dmidecode-2cf4f28f6fc671478003b31c03b93e070eee9942.tar.xz python-dmidecode-2cf4f28f6fc671478003b31c03b93e070eee9942.zip | |
Further removal of deprecated functions
Removed the `dmi_table_string' function, and `const struct
string_keyword *string' from the `options' struct. Also modified
the function calls that are now free of this, namely, `legacy_decode'
and `smbios_decode'.
Diffstat (limited to 'src/dmidecodemodule.c')
| -rw-r--r-- | src/dmidecodemodule.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dmidecodemodule.c b/src/dmidecodemodule.c index ab4561b..e551d67 100644 --- a/src/dmidecodemodule.c +++ b/src/dmidecodemodule.c @@ -211,10 +211,10 @@ int dmidecode_get_xml(options *opt, xmlNode* dmixml_n) // printf("Reading SMBIOS/DMI data from file %s.\n", dumpfile); if((buf = mem_chunk(0, 0x20, opt->dumpfile)) != NULL) { if(memcmp(buf, "_SM_", 4) == 0) { - if(smbios_decode(opt->type, opt->string, buf, opt->dumpfile, dmixml_n)) + if(smbios_decode(opt->type, buf, opt->dumpfile, dmixml_n)) found++; } else if(memcmp(buf, "_DMI_", 5) == 0) { - if(legacy_decode(opt->type, opt->string, buf, opt->dumpfile, dmixml_n)) + if(legacy_decode(opt->type, buf, opt->dumpfile, dmixml_n)) found++; } } else { @@ -228,12 +228,12 @@ int dmidecode_get_xml(options *opt, xmlNode* dmixml_n) 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) { - if(smbios_decode(opt->type, opt->string, buf + fp, opt->devmem, dmixml_n)) { + if(smbios_decode(opt->type, buf + fp, opt->devmem, dmixml_n)) { found++; fp += 16; } } else if(memcmp(buf + fp, "_DMI_", 5) == 0) { - if(legacy_decode(opt->type, opt->string, buf + fp, opt->devmem, dmixml_n)) + if(legacy_decode(opt->type, buf + fp, opt->devmem, dmixml_n)) found++; } } @@ -244,7 +244,7 @@ int dmidecode_get_xml(options *opt, xmlNode* dmixml_n) } else { if((buf = mem_chunk(fp, 0x20, opt->devmem)) == NULL) ret = 1; - else if(smbios_decode(opt->type, opt->string, buf, opt->devmem, dmixml_n)) + else if(smbios_decode(opt->type, buf, opt->devmem, dmixml_n)) found++; // TODO: dmixml_AddAttribute(dmixml_n, "efi_address", "0x%08x", efiAddress); } |