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

@ -341,7 +341,7 @@ static void powpan_initinfo(void)
dstate_setinfo("ups.model", "%s", modeltab[i].model);
} else {
/* report model value as is */
dstate_setinfo("ups.model", "%s", rtrim(s, ' '));
dstate_setinfo("ups.model", "%s", str_rtrim(s, ' '));
}
}
if ((s = strtok(NULL, ".")) != NULL) {