X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsigrok.c;h=78d1f1db07f3cc6533dc6245df003f6b2715b832;hb=8f6aa6970bf787e6a11e095322af3338ec781d78;hp=8a325fe9f07006d4e68526696bde2ed954ffedc2;hpb=af12cc40e48331f8c98294239cef60393218a46d;p=collectd.git diff --git a/src/sigrok.c b/src/sigrok.c index 8a325fe9..78d1f1db 100644 --- a/src/sigrok.c +++ b/src/sigrok.c @@ -21,8 +21,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #include #include @@ -247,7 +247,7 @@ static int sigrok_init_driver(struct config_device *cfdev, } cfdev->sdi = devlist->data; g_slist_free(devlist); - snprintf(hwident, sizeof(hwident), "%s %s %s", + ssnprintf(hwident, sizeof(hwident), "%s %s %s", cfdev->sdi->vendor ? cfdev->sdi->vendor : "", cfdev->sdi->model ? cfdev->sdi->model : "", cfdev->sdi->version ? cfdev->sdi->version : ""); @@ -340,9 +340,7 @@ static int sigrok_init(void) { status = plugin_thread_create(&sr_thread, NULL, sigrok_read_thread, NULL, "sigrok read"); if (status != 0) { - char errbuf[1024]; - ERROR("sigrok plugin: Failed to create thread: %s.", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("sigrok plugin: Failed to create thread: %s.", STRERRNO); return -1; } sr_thread_running = TRUE;