lkml.org 
[lkml]   [2010]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/9] tools/perf/perf.c: Clean up trivial style issues.
    Date
    From: Thiago Farina <tfransosi@gmail.com>

    Checked with:
    ./../scripts/checkpatch.pl --terse --file perf.c

    perf.c:51: ERROR: open brace '{' following function declarations go on the next line
    perf.c:73: ERROR: "foo*** bar" should be "foo ***bar"
    perf.c:112: ERROR: space prohibited before that close parenthesis ')'
    perf.c:127: ERROR: space prohibited before that close parenthesis ')'
    perf.c:171: ERROR: "foo** bar" should be "foo **bar"
    perf.c:213: ERROR: "(foo*)" should be "(foo *)"
    perf.c:216: ERROR: "(foo*)" should be "(foo *)"
    perf.c:217: ERROR: space required before that '*' (ctx:OxV)
    perf.c:452: ERROR: do not initialise statics to 0 or NULL
    perf.c:453: ERROR: do not initialise statics to 0 or NULL

    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Masami Hiramatsu <mhiramat@redhat.com>
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/perf.c | 21 +++++++++++----------
    1 files changed, 11 insertions(+), 10 deletions(-)

    diff --git a/tools/perf/perf.c b/tools/perf/perf.c
    index 05c861c..109b89b 100644
    --- a/tools/perf/perf.c
    +++ b/tools/perf/perf.c
    @@ -48,7 +48,8 @@ int check_pager_config(const char *cmd)
    return c.val;
    }

    -static void commit_pager_choice(void) {
    +static void commit_pager_choice(void)
    +{
    switch (use_pager) {
    case 0:
    setenv("PERF_PAGER", "cat", 1);
    @@ -70,7 +71,7 @@ static void set_debugfs_path(void)
    "tracing/events");
    }

    -static int handle_options(const char*** argv, int* argc, int* envchanged)
    +static int handle_options(const char ***argv, int *argc, int *envchanged)
    {
    int handled = 0;

    @@ -109,7 +110,7 @@ static int handle_options(const char*** argv, int* argc, int* envchanged)
    *envchanged = 1;
    } else if (!strcmp(cmd, "--perf-dir")) {
    if (*argc < 2) {
    - fprintf(stderr, "No directory given for --perf-dir.\n" );
    + fprintf(stderr, "No directory given for --perf-dir.\n");
    usage(perf_usage_string);
    }
    setenv(PERF_DIR_ENVIRONMENT, (*argv)[1], 1);
    @@ -124,7 +125,7 @@ static int handle_options(const char*** argv, int* argc, int* envchanged)
    *envchanged = 1;
    } else if (!strcmp(cmd, "--work-tree")) {
    if (*argc < 2) {
    - fprintf(stderr, "No directory given for --work-tree.\n" );
    + fprintf(stderr, "No directory given for --work-tree.\n");
    usage(perf_usage_string);
    }
    setenv(PERF_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
    @@ -168,7 +169,7 @@ static int handle_alias(int *argcp, const char ***argv)
    {
    int envchanged = 0, ret = 0, saved_errno = errno;
    int count, option_count;
    - const char** new_argv;
    + const char **new_argv;
    const char *alias_command;
    char *alias_string;

    @@ -210,11 +211,11 @@ static int handle_alias(int *argcp, const char ***argv)
    if (!strcmp(alias_command, new_argv[0]))
    die("recursive alias: %s", alias_command);

    - new_argv = realloc(new_argv, sizeof(char*) *
    + new_argv = realloc(new_argv, sizeof(char *) *
    (count + *argcp + 1));
    /* insert after command name */
    - memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
    - new_argv[count+*argcp] = NULL;
    + memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);
    + new_argv[count + *argcp] = NULL;

    *argv = new_argv;
    *argcp += count - 1;
    @@ -450,8 +451,8 @@ int main(int argc, const char **argv)
    setup_path();

    while (1) {
    - static int done_help = 0;
    - static int was_alias = 0;
    + static int done_help;
    + static int was_alias;

    was_alias = run_argv(&argc, &argv);
    if (errno != ENOENT)
    --
    1.6.2.5


    \
     
     \ /
      Last update: 2010-01-28 00:11    [W:0.026 / U:29.668 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site