lkml.org 
[lkml]   [2012]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/22 v4] Input: atmel_mxt_ts - use scnprintf for object sysfs entry
    Date
    Using scnprintf() is a cleaner way to ensure that we don't overwrite the
    PAGE_SIZE sysfs output buffer.

    Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
    ---
    drivers/input/touchscreen/atmel_mxt_ts.c | 16 ++++------------
    1 files changed, 4 insertions(+), 12 deletions(-)

    diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
    index 5eee68d..472ab29 100644
    --- a/drivers/input/touchscreen/atmel_mxt_ts.c
    +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
    @@ -903,17 +903,13 @@ static ssize_t mxt_object_show(struct device *dev,
    for (i = 0; i < data->info.object_num; i++) {
    object = data->object_table + i;

    - count += snprintf(buf + count, PAGE_SIZE - count,
    + count += scnprintf(buf + count, PAGE_SIZE - count,
    "Object[%d] (Type %d)\n",
    i + 1, object->type);
    - if (count >= PAGE_SIZE)
    - return PAGE_SIZE - 1;

    if (!mxt_object_readable(object->type)) {
    - count += snprintf(buf + count, PAGE_SIZE - count,
    + count += scnprintf(buf + count, PAGE_SIZE - count,
    "\n");
    - if (count >= PAGE_SIZE)
    - return PAGE_SIZE - 1;
    continue;
    }

    @@ -923,15 +919,11 @@ static ssize_t mxt_object_show(struct device *dev,
    if (error)
    return error;

    - count += snprintf(buf + count, PAGE_SIZE - count,
    + count += scnprintf(buf + count, PAGE_SIZE - count,
    "\t[%2d]: %02x (%d)\n", j, val, val);
    - if (count >= PAGE_SIZE)
    - return PAGE_SIZE - 1;
    }

    - count += snprintf(buf + count, PAGE_SIZE - count, "\n");
    - if (count >= PAGE_SIZE)
    - return PAGE_SIZE - 1;
    + count += scnprintf(buf + count, PAGE_SIZE - count, "\n");
    }

    return count;
    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-06-18 07:21    [W:4.158 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site