projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng {add,list,remove}-trigger: rename user id to owner uid
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
add_trigger.c
diff --git
a/src/bin/lttng/commands/add_trigger.c
b/src/bin/lttng/commands/add_trigger.c
index 9344643496c9ac044d1b5d732eaced4907ffb3b1..b1ec6dd4780b11008a9583765b7ade979207e7d0 100644
(file)
--- a/
src/bin/lttng/commands/add_trigger.c
+++ b/
src/bin/lttng/commands/add_trigger.c
@@
-40,7
+40,7
@@
enum {
OPT_CONDITION,
OPT_ACTION,
OPT_ID,
OPT_CONDITION,
OPT_ACTION,
OPT_ID,
- OPT_
USER_
ID,
+ OPT_
OWNER_U
ID,
OPT_RATE_POLICY,
OPT_NAME,
OPT_RATE_POLICY,
OPT_NAME,
@@
-2089,7
+2089,7
@@
struct argpar_opt_descr add_trigger_options[] = {
{ OPT_CONDITION, '\0', "condition", true },
{ OPT_ACTION, '\0', "action", true },
{ OPT_NAME, '\0', "name", true },
{ OPT_CONDITION, '\0', "condition", true },
{ OPT_ACTION, '\0', "action", true },
{ OPT_NAME, '\0', "name", true },
- { OPT_
USER_ID, '\0', "user-
id", true },
+ { OPT_
OWNER_UID, '\0', "owner-u
id", true },
ARGPAR_OPT_DESCR_SENTINEL,
};
ARGPAR_OPT_DESCR_SENTINEL,
};
@@
-2116,7
+2116,7
@@
int cmd_add_trigger(int argc, const char **argv)
char *error = NULL;
char *name = NULL;
int i;
char *error = NULL;
char *name = NULL;
int i;
- char *
user_
id = NULL;
+ char *
owner_u
id = NULL;
lttng_dynamic_pointer_array_init(&actions, lttng_actions_destructor);
lttng_dynamic_pointer_array_init(&actions, lttng_actions_destructor);
@@
-2222,10
+2222,10
@@
int cmd_add_trigger(int argc, const char **argv)
break;
}
break;
}
- case OPT_
USER_
ID:
+ case OPT_
OWNER_U
ID:
{
{
- if (!assign_string(&
user_
id, item_opt->arg,
- "--
user-
id")) {
+ if (!assign_string(&
owner_u
id, item_opt->arg,
+ "--
owner-u
id")) {
goto error;
}
goto error;
}
@@
-2284,15
+2284,15
@@
int cmd_add_trigger(int argc, const char **argv)
}
}
}
}
- if (
user_
id) {
+ if (
owner_u
id) {
enum lttng_trigger_status trigger_status;
char *end;
long long uid;
errno = 0;
enum lttng_trigger_status trigger_status;
char *end;
long long uid;
errno = 0;
- uid = strtol(
user_
id, &end, 10);
- if (end ==
user_
id || *end != '\0' || errno != 0) {
- ERR("Failed to parse `%s` as a user id.",
user_
id);
+ uid = strtol(
owner_u
id, &end, 10);
+ if (end ==
owner_u
id || *end != '\0' || errno != 0) {
+ ERR("Failed to parse `%s` as a user id.",
owner_u
id);
}
trigger_status = lttng_trigger_set_owner_uid(trigger, uid);
}
trigger_status = lttng_trigger_set_owner_uid(trigger, uid);
@@
-2325,6
+2325,6
@@
end:
lttng_trigger_destroy(trigger);
free(error);
free(name);
lttng_trigger_destroy(trigger);
free(error);
free(name);
- free(
user_
id);
+ free(
owner_u
id);
return ret;
}
return ret;
}
This page took
0.02749 seconds
and
4
git commands to generate.