summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2010-02-05 18:16:43 +0100
committerDavid Sommerseth <davids@redhat.com>2010-02-05 18:16:43 +0100
commit5abd4b52f056ba09b1c134870586393a223ccc79 (patch)
tree3fb191193bcd013805aaab92a2b595203d78880e
parent5ebf67efee2893c4d3dc60ec31a0efeb0894d245 (diff)
downloadpython-dmidecode-5abd4b52f056ba09b1c134870586393a223ccc79.tar.gz
python-dmidecode-5abd4b52f056ba09b1c134870586393a223ccc79.tar.xz
python-dmidecode-5abd4b52f056ba09b1c134870586393a223ccc79.zip
Removed not needed \n from log_append() entries
-rw-r--r--src/dmidecode.c6
-rw-r--r--src/dmidecodemodule.c6
-rw-r--r--src/dmixml.c2
-rw-r--r--src/efi.c2
-rw-r--r--src/util.c2
-rw-r--r--src/xmlpythonizer.c10
6 files changed, 14 insertions, 14 deletions
diff --git a/src/dmidecode.c b/src/dmidecode.c
index a29a743..e64d12f 100644
--- a/src/dmidecode.c
+++ b/src/dmidecode.c
@@ -4870,7 +4870,7 @@ static void dmi_table(Log_t *logp, int type, u32 base, u16 len, u16 num, u16 ver
#ifndef USE_MMAP
"Try compiling dmidecode with -DUSE_MMAP."
#endif
- "\n");
+ );
return;
}
@@ -4957,10 +4957,10 @@ static void dmi_table(Log_t *logp, int type, u32 base, u16 len, u16 num, u16 ver
if(i != num)
log_append(logp, LOGFL_NODUPS, LOG_WARNING,
- "Wrong DMI structures count: %d announced, only %d decoded.\n", num, i);
+ "Wrong DMI structures count: %d announced, only %d decoded.", num, i);
if(data - buf != len)
log_append(logp, LOGFL_NODUPS, LOG_WARNING,
- "Wrong DMI structures length: %d bytes announced, structures occupy %d bytes.\n",
+ "Wrong DMI structures length: %d bytes announced, structures occupy %d bytes.",
len, (unsigned int)(data - buf));
free(buf);
diff --git a/src/dmidecodemodule.c b/src/dmidecodemodule.c
index dc00279..1056a8f 100644
--- a/src/dmidecodemodule.c
+++ b/src/dmidecodemodule.c
@@ -67,7 +67,7 @@ static void init(options *opt)
/* sanity check */
if(sizeof(u8) != 1 || sizeof(u16) != 2 || sizeof(u32) != 4 || '\0' != 0) {
log_append(opt->logdata, LOGFL_NORMAL, LOG_WARNING,
- "%s: compiler incompatibility\n", "dmidecodemodule");
+ "%s: compiler incompatibility", "dmidecodemodule");
}
}
@@ -79,11 +79,11 @@ int parse_opt_type(Log_t *logp, const char *arg)
val = strtoul(arg, &next, 0);
if(next == arg) {
- log_append(logp, LOGFL_NODUPS, LOG_ERR, "Invalid type keyword: %s\n", arg);
+ log_append(logp, LOGFL_NODUPS, LOG_ERR, "Invalid type keyword: %s", arg);
return -1;
}
if(val > 0xff) {
- log_append(logp, LOGFL_NODUPS, LOG_ERR, "Invalid type number: %i\n", val);
+ log_append(logp, LOGFL_NODUPS, LOG_ERR, "Invalid type number: %i", val);
return -1;
}
diff --git a/src/dmixml.c b/src/dmixml.c
index 6f6aa60..ba285e8 100644
--- a/src/dmixml.c
+++ b/src/dmixml.c
@@ -353,7 +353,7 @@ char *dmixml_GetXPathContent(Log_t *logp, char *buf, size_t buflen, xmlXPathObje
default:
log_append(logp, LOGFL_NORMAL, LOG_WARNING, "dmixml_GetXPathContent(...):: "
- "Do not know how to handle XPath type %i\n",
+ "Do not know how to handle XPath type %i",
xpo->type);
return NULL;
}
diff --git a/src/efi.c b/src/efi.c
index 171ae30..ae8d0db 100644
--- a/src/efi.c
+++ b/src/efi.c
@@ -77,7 +77,7 @@ int address_from_efi(Log_t *logp, size_t * address)
perror(filename);
if(ret == EFI_NO_SMBIOS) {
- log_append(logp, LOGFL_NODUPS, LOG_WARNING, "%s: SMBIOS entry point missing\n", filename);
+ log_append(logp, LOGFL_NODUPS, LOG_WARNING, "%s: SMBIOS entry point missing", filename);
}
return ret;
diff --git a/src/util.c b/src/util.c
index f0d9f93..2eebf30 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, LOGFL_NORMAL, LOG_WARNING, "%s: Unexpected end of file\n", prefix);
+ log_append(logp, LOGFL_NORMAL, LOG_WARNING, "%s: Unexpected end of file", prefix);
return -1;
}
diff --git a/src/xmlpythonizer.c b/src/xmlpythonizer.c
index 5342bac..e318023 100644
--- a/src/xmlpythonizer.c
+++ b/src/xmlpythonizer.c
@@ -305,7 +305,7 @@ inline ptzTYPES _convert_maptype(Log_t *logp, const char *str) {
return ptzLIST_DICT;
} else {
log_append(logp, LOGFL_NORMAL, LOG_WARNING,
- "Unknown field type: %s - defaulting to 'constant'\n", str);
+ "Unknown field type: %s - defaulting to 'constant'", str);
return ptzCONST;
}
}
@@ -666,7 +666,7 @@ inline PyObject *StringToPyObj(Log_t *logp, ptzMAP *val_m, const char *instr) {
default:
log_append(logp, LOGFL_NODUPS, LOG_WARNING,
- "Invalid type '%i' for value '%s'\n",
+ "Invalid type '%i' for value '%s'",
val_m->type_value, instr);
value = Py_None;
}
@@ -737,7 +737,7 @@ char *_get_key_value(Log_t *logp, char *key, size_t buflen,
break;
default:
- log_append(logp, LOGFL_NODUPS, LOG_WARNING, "Unknown key type: %i\n", map_p->type_key);
+ log_append(logp, LOGFL_NODUPS, LOG_WARNING, "Unknown key type: %i", map_p->type_key);
return NULL;
}
// We consider to have a key, if the first byte is a readable
@@ -999,7 +999,7 @@ PyObject *_deep_pythonize(Log_t *logp, PyObject *retdata,
break;
default:
- log_append(logp, LOGFL_NODUPS, LOG_WARNING, "Unknown value type: %i\n", map_p->type_value);
+ log_append(logp, LOGFL_NODUPS, LOG_WARNING, "Unknown value type: %i", map_p->type_value);
break;
}
@@ -1072,7 +1072,7 @@ PyObject *pythonizeXMLnode(Log_t *logp, ptzMAP *in_map, xmlNode *data_n) {
else {
log_append(logp, LOGFL_NODUPS, LOG_WARNING,
"** pythonizeXMLnode :: Could not locate node for key value: "
- "root path '%s', key '%s'\n", map_p->rootpath, map_p->key);
+ "root path '%s', key '%s'", map_p->rootpath, map_p->key);
}
#endif
if( xpo != NULL ) {