lkml.org 
[lkml]   [2010]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH] security/ima: replace gcc specific __FUNCTION__ with __func__
    As noted by checkpatch.pl, __func__ should be used instead of gcc
    specific __FUNCTION__.

    Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Cc: Mimi Zohar <zohar@us.ibm.com>
    Cc: James Morris <jmorris@namei.org>

    ---

    diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c
    index 2d4d05d..6cc2243 100644
    --- a/security/integrity/ima/ima_iint.c
    +++ b/security/integrity/ima/ima_iint.c
    @@ -79,17 +79,17 @@ void iint_free(struct kref *kref)
    iint->version = 0;
    iint->flags = 0UL;
    if (iint->readcount != 0) {
    - printk(KERN_INFO "%s: readcount: %ld\n", __FUNCTION__,
    + printk(KERN_INFO "%s: readcount: %ld\n", __func__,
    iint->readcount);
    iint->readcount = 0;
    }
    if (iint->writecount != 0) {
    - printk(KERN_INFO "%s: writecount: %ld\n", __FUNCTION__,
    + printk(KERN_INFO "%s: writecount: %ld\n", __func__,
    iint->writecount);
    iint->writecount = 0;
    }
    if (iint->opencount != 0) {
    - printk(KERN_INFO "%s: opencount: %ld\n", __FUNCTION__,
    + printk(KERN_INFO "%s: opencount: %ld\n", __func__,
    iint->opencount);
    iint->opencount = 0;
    }
    diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
    index 294b005..983037f 100644
    --- a/security/integrity/ima/ima_main.c
    +++ b/security/integrity/ima/ima_main.c
    @@ -194,7 +194,7 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct inode *inode,
    (iint->writecount < 0)) &&
    !ima_limit_imbalance(file)) {
    printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n",
    - __FUNCTION__, iint->readcount, iint->writecount,
    + __func__, iint->readcount, iint->writecount,
    iint->opencount);
    dump_stack();
    }
    \
     
     \ /
      Last update: 2010-03-10 01:11    [W:0.032 / U:0.296 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site