X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsigrok.c;h=a8b67afe77dd2ed9f4066054a00761f55fb31086;hb=6378ec288f34ff250b2971a1452338a2b34c240a;hp=6d4cb976ceaa6e220be1371ac1ce85e6ddcaff73;hpb=be126043c2be20399d7670fe194645292018bde0;p=collectd.git diff --git a/src/sigrok.c b/src/sigrok.c index 6d4cb976..a8b67afe 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 @@ -248,9 +248,9 @@ static int sigrok_init_driver(struct config_device *cfdev, cfdev->sdi = devlist->data; g_slist_free(devlist); snprintf(hwident, sizeof(hwident), "%s %s %s", - cfdev->sdi->vendor ? cfdev->sdi->vendor : "", - cfdev->sdi->model ? cfdev->sdi->model : "", - cfdev->sdi->version ? cfdev->sdi->version : ""); + cfdev->sdi->vendor ? cfdev->sdi->vendor : "", + cfdev->sdi->model ? cfdev->sdi->model : "", + cfdev->sdi->version ? cfdev->sdi->version : ""); INFO("sigrok plugin: Device \"%s\" is a %s", cfdev->name, hwident); if (sr_dev_open(cfdev->sdi) != SR_OK) @@ -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;