projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: liblttng-ctl: fix -Wshadow error in lttng_enable_event_with_exclusions
[lttng-tools.git]
/
src
/
lib
/
lttng-ctl
/
lttng-ctl.c
diff --git
a/src/lib/lttng-ctl/lttng-ctl.c
b/src/lib/lttng-ctl/lttng-ctl.c
index 5529b3364f12027c8b143fbdcba8a4e7304dad70..29ebe9c9ea99ccb76fae9c5d753bf456c53264e5 100644
(file)
--- a/
src/lib/lttng-ctl/lttng-ctl.c
+++ b/
src/lib/lttng-ctl/lttng-ctl.c
@@
-18,6
+18,7
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
+#include <common/bytecode/bytecode.h>
#include <common/common.h>
#include <common/compat/errno.h>
#include <common/compat/string.h>
#include <common/common.h>
#include <common/compat/errno.h>
#include <common/compat/string.h>
@@
-45,7
+46,6
@@
#include <common/filter/filter-ast.h>
#include <common/filter/filter-parser.h>
#include <common/filter/filter-ast.h>
#include <common/filter/filter-parser.h>
-#include <common/filter/filter-bytecode.h>
#include <common/filter/memstream.h>
#include "lttng-ctl-helper.h"
#include <common/filter/memstream.h>
#include "lttng-ctl-helper.h"
@@
-1270,15
+1270,15
@@
int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
assert(fd_count == 0 || fd_count == 1);
if (fd_count == 1) {
assert(fd_count == 0 || fd_count == 1);
if (fd_count == 1) {
- struct fd_handle *h
andle
=
+ struct fd_handle *h =
lttng_payload_view_pop_fd_handle(&view);
lttng_payload_view_pop_fd_handle(&view);
- if (!h
andle
) {
+ if (!h) {
goto mem_error;
}
goto mem_error;
}
- fd_to_send = fd_handle_get_fd(h
andle
);
- fd_handle_put(h
andle
);
+ fd_to_send = fd_handle_get_fd(h);
+ fd_handle_put(h);
}
ret = lttng_ctl_ask_sessiond_fds_varlen(&lsm,
}
ret = lttng_ctl_ask_sessiond_fds_varlen(&lsm,
This page took
0.025502 seconds
and
4
git commands to generate.