projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: implicit conversion of enum types in consumer
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index a506737ab4170880b23c28a959c546e65ed9f81c..1b01d414a0248b0207bbf72aba620a8fa62b93e4 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-29,6
+29,7
@@
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/stat.h>
+#include <bin/lttng-consumerd/health-consumerd.h>
#include <common/common.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/common.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/sessiond-comm/sessiond-comm.h>
@@
-42,7
+43,6
@@
#include <common/consumer-timer.h>
#include "kernel-consumer.h"
#include <common/consumer-timer.h>
#include "kernel-consumer.h"
-#include "../../bin/lttng-consumerd/health-consumerd.h"
extern struct lttng_consumer_global_data consumer_data;
extern int consumer_poll_timeout;
extern struct lttng_consumer_global_data consumer_data;
extern int consumer_poll_timeout;
@@
-418,7
+418,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
int sock, struct pollfd *consumer_sockpoll)
{
ssize_t ret;
int sock, struct pollfd *consumer_sockpoll)
{
ssize_t ret;
- enum ltt
ng_error_code ret_code = LTTNG_OK
;
+ enum ltt
comm_return_code ret_code = LTTCOMM_CONSUMERD_SUCCESS
;
struct lttcomm_consumer_msg msg;
health_code_update();
struct lttcomm_consumer_msg msg;
health_code_update();
@@
-577,7
+577,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
health_code_update();
health_code_update();
- if (ret_code != LTT
NG_OK
) {
+ if (ret_code != LTT
COMM_CONSUMERD_SUCCESS
) {
/* Channel was not found. */
goto end_nosignal;
}
/* Channel was not found. */
goto end_nosignal;
}
This page took
0.023919 seconds
and
4
git commands to generate.