diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-08-27 23:53:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-08-27 23:53:00 -0700 |
| commit | 11f7f7de609500e4bdfc359dc260a1df75bdf23a (patch) | |
| tree | 87f8bf4f71155672b791c3807066779b91520eec /security | |
| parent | 4b58cfe0cdabb3a9cde53e1584584ebb9c838409 (diff) | |
| download | history-11f7f7de609500e4bdfc359dc260a1df75bdf23a.tar.gz | |
Don't paste __FUNCTION__, that's deprecated.
Diffstat (limited to 'security')
| -rw-r--r-- | security/security.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/security/security.c b/security/security.c index 0cf0cea2e17bb7..892208b20bc47a 100644 --- a/security/security.c +++ b/security/security.c @@ -52,7 +52,7 @@ static int inline verify (struct security_operations *ops) /* verify the security_operations structure exists */ if (!ops) { printk (KERN_INFO "Passed a NULL security_operations " - "pointer, " __FUNCTION__ " failed.\n"); + "pointer, %s failed.\n", __FUNCTION__); return -EINVAL; } @@ -69,8 +69,8 @@ static int inline verify (struct security_operations *ops) if (err) { printk (KERN_INFO "Not enough functions specified in the " - "security_operation structure, " __FUNCTION__ - " failed.\n"); + "security_operation structure, %s failed.\n", + __FUNCTION__); return -EINVAL; } return 0; @@ -108,13 +108,13 @@ int register_security (struct security_operations *ops) { if (verify (ops)) { - printk (KERN_INFO __FUNCTION__ " could not verify " - "security_operations structure.\n"); + printk (KERN_INFO "%s could not verify " + "security_operations structure.\n", __FUNCTION__); return -EINVAL; } if (security_ops != &dummy_security_ops) { printk (KERN_INFO "There is already a security " - "framework initialized, " __FUNCTION__ " failed.\n"); + "framework initialized, %s failed.\n", __FUNCTION__); return -EINVAL; } @@ -137,9 +137,9 @@ int register_security (struct security_operations *ops) int unregister_security (struct security_operations *ops) { if (ops != security_ops) { - printk (KERN_INFO __FUNCTION__ ": trying to unregister " + printk (KERN_INFO "%s: trying to unregister " "a security_opts structure that is not " - "registered, failing.\n"); + "registered, failing.\n", __FUNCTION__); return -EINVAL; } @@ -163,14 +163,14 @@ int unregister_security (struct security_operations *ops) int mod_reg_security (const char *name, struct security_operations *ops) { if (verify (ops)) { - printk (KERN_INFO __FUNCTION__ " could not verify " - "security operations.\n"); + printk (KERN_INFO "%s could not verify " + "security operations.\n", __FUNCTION__); return -EINVAL; } if (ops == security_ops) { - printk (KERN_INFO __FUNCTION__ " security operations " - "already registered.\n"); + printk (KERN_INFO "%s security operations " + "already registered.\n", __FUNCTION__); return -EINVAL; } @@ -193,8 +193,8 @@ int mod_reg_security (const char *name, struct security_operations *ops) int mod_unreg_security (const char *name, struct security_operations *ops) { if (ops == security_ops) { - printk (KERN_INFO __FUNCTION__ " invalid attempt to unregister " - " primary security ops.\n"); + printk (KERN_INFO "%s invalid attempt to unregister " + " primary security ops.\n", __FUNCTION__); return -EINVAL; } |