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/commoncap.c | |
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/commoncap.c')
-rw-r--r-- | security/commoncap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 06d5c9469ba3..852905789caf 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
@@ -267,7 +267,7 @@ static int get_file_caps(struct linux_binprm *bprm) | |||
267 | rc = cap_from_disk(&vcaps, bprm, rc); | 267 | rc = cap_from_disk(&vcaps, bprm, rc); |
268 | if (rc) | 268 | if (rc) |
269 | printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n", | 269 | printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n", |
270 | __FUNCTION__, rc, bprm->filename); | 270 | __func__, rc, bprm->filename); |
271 | 271 | ||
272 | out: | 272 | out: |
273 | dput(dentry); | 273 | dput(dentry); |
@@ -302,7 +302,7 @@ int cap_bprm_set_security (struct linux_binprm *bprm) | |||
302 | ret = get_file_caps(bprm); | 302 | ret = get_file_caps(bprm); |
303 | if (ret) | 303 | if (ret) |
304 | printk(KERN_NOTICE "%s: get_file_caps returned %d for %s\n", | 304 | printk(KERN_NOTICE "%s: get_file_caps returned %d for %s\n", |
305 | __FUNCTION__, ret, bprm->filename); | 305 | __func__, ret, bprm->filename); |
306 | 306 | ||
307 | /* To support inheritance of root-permissions and suid-root | 307 | /* To support inheritance of root-permissions and suid-root |
308 | * executables under compatibility mode, we raise all three | 308 | * executables under compatibility mode, we raise all three |