summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2010-01-08 19:27:35 +0100
committerDavid Sommerseth <davids@redhat.com>2010-01-08 19:27:35 +0100
commit8462924ea831699ad3e5a2e6c25add902cf11bad (patch)
tree86bfdd5c5a1e55ed391c9173c6a10d53c8a8ea92 /src
parent101070880e270118aa1f3992e2734a667dde575e (diff)
downloadpython-dmidecode-8462924ea831699ad3e5a2e6c25add902cf11bad.tar.gz
python-dmidecode-8462924ea831699ad3e5a2e6c25add902cf11bad.tar.xz
python-dmidecode-8462924ea831699ad3e5a2e6c25add902cf11bad.zip
Port dmidump to use the new log API
This port will not create a new log buffer (Log_t), but log_append() will print errors to stderr in this case, as the log buffer pointer is NULL.
Diffstat (limited to 'src')
-rw-r--r--src/dmidump.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dmidump.c b/src/dmidump.c
index 641b937..fc67481 100644
--- a/src/dmidump.c
+++ b/src/dmidump.c
@@ -109,7 +109,7 @@ int dumpling(u8 * buf, const char *dumpfile, u8 mode)
u8 *buff;
- if((buff = mem_chunk(base, len, DEFAULT_MEM_DEV)) != NULL) {
+ if((buff = mem_chunk(NULL, base, len, DEFAULT_MEM_DEV)) != NULL) {
//. Part 1.
#ifdef NDEBUG
printf("# Writing %d bytes to %s.\n", len, dumpfile);
@@ -156,10 +156,10 @@ int dump(const char *memdev, const char *dumpfile)
u8 *buf;
/* First try EFI (ia64, Intel-based Mac) */
- efi = address_from_efi(&fp);
+ efi = address_from_efi(NULL, &fp);
if(efi == EFI_NOT_FOUND) {
/* Fallback to memory scan (x86, x86_64) */
- if((buf = mem_chunk(0xF0000, 0x10000, memdev)) != NULL) {
+ if((buf = mem_chunk(NULL, 0xF0000, 0x10000, memdev)) != NULL) {
for(fp = 0; fp <= 0xFFF0; fp += 16) {
if(memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) {
if(dumpling(buf + fp, dumpfile, NON_LEGACY))
@@ -175,7 +175,7 @@ int dump(const char *memdev, const char *dumpfile)
} else if(efi == EFI_NO_SMBIOS) {
ret = -1;
} else {
- if((buf = mem_chunk(fp, 0x20, memdev)) == NULL)
+ if((buf = mem_chunk(NULL, fp, 0x20, memdev)) == NULL)
ret = -1;
else if(dumpling(buf, dumpfile, NON_LEGACY))
found++;