summaryrefslogtreecommitdiffstats
path: root/src/util.c
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2010-02-05 15:33:39 +0100
committerDavid Sommerseth <davids@redhat.com>2010-02-05 15:33:39 +0100
commit5ebf67efee2893c4d3dc60ec31a0efeb0894d245 (patch)
tree337c4ff23b1498096e64179dadddf8b39a81e340 /src/util.c
parent24af40698f1486c899333ea1f129e87590cdee7e (diff)
downloadpython-dmidecode-5ebf67efee2893c4d3dc60ec31a0efeb0894d245.tar.gz
python-dmidecode-5ebf67efee2893c4d3dc60ec31a0efeb0894d245.tar.xz
python-dmidecode-5ebf67efee2893c4d3dc60ec31a0efeb0894d245.zip
Added logging flag to log_append() to change log behaviour
Valid flags are: * LOGFL_NORMAL Log all messages to the log context, and send log message to stderr on errors * LOGFL_NODUPS Log only unique messages. Duplicated messages will be removed * LOGFL_NOSTDERR Don't write to stderr, even if errors occur
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/util.c b/src/util.c
index ba1a89a..f0d9f93 100644
--- a/src/util.c
+++ b/src/util.c
@@ -69,7 +69,7 @@ static int myread(Log_t *logp, int fd, u8 * buf, size_t count, const char *prefi
if(r2 != count) {
close(fd);
- log_append(logp, LOG_WARNING, "%s: Unexpected end of file\n", prefix);
+ log_append(logp, LOGFL_NORMAL, LOG_WARNING, "%s: Unexpected end of file\n", prefix);
return -1;
}
@@ -102,12 +102,12 @@ void *mem_chunk(Log_t *logp, size_t base, size_t len, const char *devmem)
#endif
if((fd = open(devmem, O_RDONLY)) == -1) {
- log_append(logp, LOG_WARNING, "%s: %s", devmem, strerror(errno));
+ log_append(logp, LOGFL_NORMAL, LOG_WARNING, "%s: %s", devmem, strerror(errno));
return NULL;
}
if((p = malloc(len)) == NULL) {
- log_append(logp, LOG_WARNING, "malloc: %s", strerror(errno));
+ log_append(logp, LOGFL_NORMAL, LOG_WARNING, "malloc: %s", strerror(errno));
return NULL;
}
#ifdef USE_MMAP
@@ -123,7 +123,7 @@ void *mem_chunk(Log_t *logp, size_t base, size_t len, const char *devmem)
*/
mmp = mmap(0, mmoffset + len, PROT_READ, MAP_SHARED, fd, base - mmoffset);
if(mmp == MAP_FAILED) {
- log_append(logp, LOG_WARNING, "%s (mmap): %s", devmem, strerror(errno));
+ log_append(logp, LOGFL_NORMAL, LOG_WARNING, "%s (mmap): %s", devmem, strerror(errno));
free(p);
return NULL;
}
@@ -131,11 +131,11 @@ void *mem_chunk(Log_t *logp, size_t base, size_t len, const char *devmem)
memcpy(p, (u8 *) mmp + mmoffset, len);
if(munmap(mmp, mmoffset + len) == -1) {
- log_append(logp, LOG_WARNING, "%s (munmap): %s", devmem, strerror(errno));
+ log_append(logp, LOGFL_NORMAL, LOG_WARNING, "%s (munmap): %s", devmem, strerror(errno));
}
#else /* USE_MMAP */
if(lseek(fd, base, SEEK_SET) == -1) {
- log_append(logp, LOG_WARNING, "%s (lseek): %s", devmem, strerror(errno));
+ log_append(logp, LOGFL_NORMAL, LOG_WARNING, "%s (lseek): %s", devmem, strerror(errno));
free(p);
return NULL;
}