Imported Upstream version 2.7.4

This commit is contained in:
Laurent Bigonville 2016-07-18 02:11:41 +02:00
parent fd413a3168
commit c9cb2187ee
290 changed files with 7473 additions and 2607 deletions

View file

@ -230,7 +230,7 @@ static void powpan_initinfo(void)
* was used for autodetection of the UPS. No need to do it again.
*/
if ((s = strtok(&powpan_answer[1], ",")) != NULL) {
dstate_setinfo("ups.model", "%s", rtrim(s, ' '));
dstate_setinfo("ups.model", "%s", str_rtrim(s, ' '));
}
if ((s = strtok(NULL, ",")) != NULL) {
dstate_setinfo("ups.firmware", "%s", s);
@ -239,7 +239,7 @@ static void powpan_initinfo(void)
dstate_setinfo("ups.serial", "%s", s);
}
if ((s = strtok(NULL, ",")) != NULL) {
dstate_setinfo("ups.mfr", "%s", rtrim(s, ' '));
dstate_setinfo("ups.mfr", "%s", str_rtrim(s, ' '));
}
/*