提交 6e474e30 编写于 作者: J John Johansen

apparmor: rename hname_tail to basename

Rename to the shorter and more familiar shell cmd name
Signed-off-by: NJohn Johansen <john.johansen@canonical.com>
上级 efeee83a
...@@ -130,12 +130,12 @@ struct aa_policy { ...@@ -130,12 +130,12 @@ struct aa_policy {
}; };
/** /**
* hname_tail - find the last component of an hname * basename - find the last component of an hname
* @name: hname to find the base profile name component of (NOT NULL) * @name: hname to find the base profile name component of (NOT NULL)
* *
* Returns: the tail (base profile name) name component of an hname * Returns: the tail (base profile name) name component of an hname
*/ */
static inline const char *hname_tail(const char *hname) static inline const char *basename(const char *hname)
{ {
char *split; char *split;
......
...@@ -184,7 +184,7 @@ bool aa_policy_init(struct aa_policy *policy, const char *prefix, ...@@ -184,7 +184,7 @@ bool aa_policy_init(struct aa_policy *policy, const char *prefix,
if (!policy->hname) if (!policy->hname)
return 0; return 0;
/* base.name is a substring of fqname */ /* base.name is a substring of fqname */
policy->name = (char *)hname_tail(policy->hname); policy->name = (char *)basename(policy->hname);
INIT_LIST_HEAD(&policy->list); INIT_LIST_HEAD(&policy->list);
INIT_LIST_HEAD(&policy->profiles); INIT_LIST_HEAD(&policy->profiles);
......
...@@ -617,7 +617,7 @@ bool aa_may_manage_policy(int op) ...@@ -617,7 +617,7 @@ bool aa_may_manage_policy(int op)
static struct aa_profile *__list_lookup_parent(struct list_head *lh, static struct aa_profile *__list_lookup_parent(struct list_head *lh,
struct aa_profile *profile) struct aa_profile *profile)
{ {
const char *base = hname_tail(profile->base.hname); const char *base = basename(profile->base.hname);
long len = base - profile->base.hname; long len = base - profile->base.hname;
struct aa_load_ent *ent; struct aa_load_ent *ent;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册