summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e1e9451)
The term trigger "id" has been changed to trigger "name", these are
leftovers. Fix them.
Change-Id: Ic05925af1cd25917de75a0a4d061324604e5a599
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
{
int ret;
struct argpar_parse_ret argpar_parse_ret = {};
{
int ret;
struct argpar_parse_ret argpar_parse_ret = {};
+ const char *name = NULL;
int i;
struct lttng_triggers *triggers = NULL;
unsigned int triggers_count;
int i;
struct lttng_triggers *triggers = NULL;
unsigned int triggers_count;
const struct argpar_item_non_opt *item_non_opt =
(const struct argpar_item_non_opt *) item;
const struct argpar_item_non_opt *item_non_opt =
(const struct argpar_item_non_opt *) item;
ERR("Unexpected argument '%s'", item_non_opt->arg);
goto error;
}
ERR("Unexpected argument '%s'", item_non_opt->arg);
goto error;
}
- id = item_non_opt->arg;
+ name = item_non_opt->arg;
- if (!id) {
- ERR("Missing `id` argument.");
+ if (!name) {
+ ERR("Missing `name` argument.");
trigger, &trigger_uid);
assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
trigger, &trigger_uid);
assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
- if (trigger_uid == uid && strcmp(trigger_name, id) == 0) {
+ if (trigger_uid == uid && strcmp(trigger_name, name) == 0) {
trigger_to_remove = trigger;
break;
}
}
if (!trigger_to_remove) {
trigger_to_remove = trigger;
break;
}
}
if (!trigger_to_remove) {
- ERR("Couldn't find trigger with id `%s`.", id);
+ ERR("Couldn't find trigger with name `%s`.", name);
goto error;
}
ret = lttng_unregister_trigger(trigger_to_remove);
if (ret != 0) {
goto error;
}
ret = lttng_unregister_trigger(trigger_to_remove);
if (ret != 0) {
- ERR("Failed to unregister trigger `%s`.", id);
+ ERR("Failed to unregister trigger `%s`.", name);
- MSG("Removed trigger `%s`.", id);
+ MSG("Removed trigger `%s`.", name);