summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d374061)
Background
==========
When building with the NDEBUG definition the `assert()` statements are
removed.
Issue
=====
Currently, a few `assert()` statements in the code base contain
statements that have side effects and removing them changes the
behavior for the program.
Fix
===
Extract the statements with side effects out of the `assert()`
statements.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I0b11c8e25c3380563332b4c0fad15f70b09a7335
if (reg_sock) {
uint16_t port;
if (reg_sock) {
uint16_t port;
- assert(lttcomm_sock_get_port(reg_sock, &port) == 0);
+ ret = lttcomm_sock_get_port(reg_sock, &port);
+ assert(ret == 0);
ret = write_agent_port(port);
if (ret) {
ret = write_agent_port(port);
if (ret) {
{
enum lttng_event_rule_generate_exclusions_status
generate_exclusion_status;
{
enum lttng_event_rule_generate_exclusions_status
generate_exclusion_status;
+ enum lttng_condition_status cond_status;
struct ust_app_event_notifier_rule *ua_event_notifier_rule;
struct lttng_condition *condition = NULL;
const struct lttng_event_rule *event_rule = NULL;
struct ust_app_event_notifier_rule *ua_event_notifier_rule;
struct lttng_condition *condition = NULL;
const struct lttng_event_rule *event_rule = NULL;
assert(lttng_condition_get_type(condition) ==
LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
assert(lttng_condition_get_type(condition) ==
LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
- assert(LTTNG_CONDITION_STATUS_OK ==
- lttng_condition_event_rule_matches_get_rule(
- condition, &event_rule));
+ cond_status = lttng_condition_event_rule_matches_get_rule(
+ condition, &event_rule);
+ assert(cond_status == LTTNG_CONDITION_STATUS_OK);
assert(event_rule);
ua_event_notifier_rule->error_counter_index =
assert(event_rule);
ua_event_notifier_rule->error_counter_index =
ret = pipe(unknown_fds);
assert(!ret);
ret = pipe(unknown_fds);
assert(!ret);
- assert(close(unknown_fds[0]) == 0);
- assert(close(unknown_fds[1]) == 0);
+ ret = close(unknown_fds[0]);
+ assert(ret == 0);
+ ret = close(unknown_fds[1]);
+ assert(ret == 0);
ret = fd_tracker_open_unsuspendable_fd(tracker, &out_fd,
NULL, 1, noop_open, &stdout_fd);
ret = fd_tracker_open_unsuspendable_fd(tracker, &out_fd,
NULL, 1, noop_open, &stdout_fd);