X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.cpp;fp=src%2Fbin%2Flttng-relayd%2Fmain.cpp;h=9793e277808975728d5f6965e12f8648de35a9ff;hb=5c7248cd5bce45bf64d563fb4e130a63bf345f11;hp=e7598974de380e57ce76636d80b4d9474e3ed769;hpb=cd9adb8b829564212158943a0d279bb35322ab30;p=lttng-tools.git diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp index e7598974d..9793e2778 100644 --- a/src/bin/lttng-relayd/main.cpp +++ b/src/bin/lttng-relayd/main.cpp @@ -490,7 +490,7 @@ static int config_entry_handler(const struct config_entry *entry, for (i = 0; i < (sizeof(long_options) / sizeof(struct option)) - 1; i++) { /* Ignore if entry name is not fully matched. */ - if (strcmp(entry->name, long_options[i].name)) { + if (strcmp(entry->name, long_options[i].name) != 0) { continue; } @@ -1320,7 +1320,12 @@ static void *relay_thread_dispatcher(void *data __attribute__((unused))) * the data will be read at some point in time * or wait to the end of the world :) */ - ret = lttng_write(relay_conn_pipe[1], &new_conn, sizeof(new_conn)); + ret = lttng_write(relay_conn_pipe[1], &new_conn, sizeof(new_conn)); /* NOLINT + sizeof + used + on a + pointer. + */ if (ret < 0) { PERROR("write connection pipe"); connection_put(new_conn); @@ -3961,7 +3966,10 @@ restart: if (revents & LPOLLIN) { struct relay_connection *conn; - ret = lttng_read(relay_conn_pipe[0], &conn, sizeof(conn)); + ret = lttng_read(relay_conn_pipe[0], + &conn, + sizeof(conn)); /* NOLINT sizeof used on a + pointer. */ if (ret < 0) { goto error; }