diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 18:03:59 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-04-18 06:26:07 -0400 |
commit | dd6f953adb5c4deb9cd7b6a5054e7d5eafe4ed71 (patch) | |
tree | 0ed459ca8da43b7e0486c8f0a840845a731920bf /security/selinux/ss | |
parent | b0c636b99997c8594da6a46e166ce4fcf6956fda (diff) |
security: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: James Morris <jmorris@namei.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/ss')
-rw-r--r-- | security/selinux/ss/services.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 4a14348de876..face5795c760 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -413,7 +413,7 @@ static int context_struct_compute_av(struct context *scontext, | |||
413 | return 0; | 413 | return 0; |
414 | 414 | ||
415 | inval_class: | 415 | inval_class: |
416 | printk(KERN_ERR "%s: unrecognized class %d\n", __FUNCTION__, tclass); | 416 | printk(KERN_ERR "%s: unrecognized class %d\n", __func__, tclass); |
417 | return -EINVAL; | 417 | return -EINVAL; |
418 | } | 418 | } |
419 | 419 | ||
@@ -2206,7 +2206,7 @@ int security_get_permissions(char *class, char ***perms, int *nperms) | |||
2206 | match = hashtab_search(policydb.p_classes.table, class); | 2206 | match = hashtab_search(policydb.p_classes.table, class); |
2207 | if (!match) { | 2207 | if (!match) { |
2208 | printk(KERN_ERR "%s: unrecognized class %s\n", | 2208 | printk(KERN_ERR "%s: unrecognized class %s\n", |
2209 | __FUNCTION__, class); | 2209 | __func__, class); |
2210 | rc = -EINVAL; | 2210 | rc = -EINVAL; |
2211 | goto out; | 2211 | goto out; |
2212 | } | 2212 | } |