mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +00:00
perf tools: Remove all char * typecasts and use const in prototype
The (char *) for all the static strings was a fix for the symptom and not the disease. The real issue was that the function prototypes needed to be declared "const char *". Signed-off-by: Steven Rostedt <srostedt@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> LKML-Reference: <20091014194400.635935008@goodmis.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Steven Rostedt
Ingo Molnar
parent
afdf1a404e
commit
c4dc775f53
@ -685,10 +685,10 @@ static char *event_read_name(void)
|
||||
{
|
||||
char *token;
|
||||
|
||||
if (read_expected(EVENT_ITEM, (char *)"name") < 0)
|
||||
if (read_expected(EVENT_ITEM, "name") < 0)
|
||||
return NULL;
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
return NULL;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token) < 0)
|
||||
@ -706,10 +706,10 @@ static int event_read_id(void)
|
||||
char *token;
|
||||
int id;
|
||||
|
||||
if (read_expected_item(EVENT_ITEM, (char *)"ID") < 0)
|
||||
if (read_expected_item(EVENT_ITEM, "ID") < 0)
|
||||
return -1;
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
return -1;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token) < 0)
|
||||
@ -759,7 +759,7 @@ static int event_read_fields(struct event *event, struct format_field **fields)
|
||||
|
||||
count++;
|
||||
|
||||
if (test_type_token(type, token, EVENT_ITEM, (char *)"field"))
|
||||
if (test_type_token(type, token, EVENT_ITEM, "field"))
|
||||
goto fail;
|
||||
free_token(token);
|
||||
|
||||
@ -774,7 +774,7 @@ static int event_read_fields(struct event *event, struct format_field **fields)
|
||||
type = read_token(&token);
|
||||
}
|
||||
|
||||
if (test_type_token(type, token, EVENT_OP, (char *)":") < 0)
|
||||
if (test_type_token(type, token, EVENT_OP, ":") < 0)
|
||||
return -1;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token) < 0)
|
||||
@ -892,14 +892,14 @@ static int event_read_fields(struct event *event, struct format_field **fields)
|
||||
field->flags |= FIELD_IS_DYNAMIC;
|
||||
}
|
||||
|
||||
if (test_type_token(type, token, EVENT_OP, (char *)";"))
|
||||
if (test_type_token(type, token, EVENT_OP, ";"))
|
||||
goto fail;
|
||||
free_token(token);
|
||||
|
||||
if (read_expected(EVENT_ITEM, (char *)"offset") < 0)
|
||||
if (read_expected(EVENT_ITEM, "offset") < 0)
|
||||
goto fail_expect;
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
goto fail_expect;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token))
|
||||
@ -907,13 +907,13 @@ static int event_read_fields(struct event *event, struct format_field **fields)
|
||||
field->offset = strtoul(token, NULL, 0);
|
||||
free_token(token);
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)";") < 0)
|
||||
if (read_expected(EVENT_OP, ";") < 0)
|
||||
goto fail_expect;
|
||||
|
||||
if (read_expected(EVENT_ITEM, (char *)"size") < 0)
|
||||
if (read_expected(EVENT_ITEM, "size") < 0)
|
||||
goto fail_expect;
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
goto fail_expect;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token))
|
||||
@ -921,18 +921,18 @@ static int event_read_fields(struct event *event, struct format_field **fields)
|
||||
field->size = strtoul(token, NULL, 0);
|
||||
free_token(token);
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)";") < 0)
|
||||
if (read_expected(EVENT_OP, ";") < 0)
|
||||
goto fail_expect;
|
||||
|
||||
type = read_token(&token);
|
||||
if (type != EVENT_NEWLINE) {
|
||||
/* newer versions of the kernel have a "signed" type */
|
||||
if (test_type_token(type, token, EVENT_ITEM, (char *)"signed"))
|
||||
if (test_type_token(type, token, EVENT_ITEM, "signed"))
|
||||
goto fail;
|
||||
|
||||
free_token(token);
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
goto fail_expect;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token))
|
||||
@ -941,7 +941,7 @@ static int event_read_fields(struct event *event, struct format_field **fields)
|
||||
/* add signed type */
|
||||
|
||||
free_token(token);
|
||||
if (read_expected(EVENT_OP, (char *)";") < 0)
|
||||
if (read_expected(EVENT_OP, ";") < 0)
|
||||
goto fail_expect;
|
||||
|
||||
if (read_expect_type(EVENT_NEWLINE, &token))
|
||||
@ -970,10 +970,10 @@ static int event_read_format(struct event *event)
|
||||
char *token;
|
||||
int ret;
|
||||
|
||||
if (read_expected_item(EVENT_ITEM, (char *)"format") < 0)
|
||||
if (read_expected_item(EVENT_ITEM, "format") < 0)
|
||||
return -1;
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
return -1;
|
||||
|
||||
if (read_expect_type(EVENT_NEWLINE, &token))
|
||||
@ -1033,7 +1033,7 @@ process_cond(struct event *event, struct print_arg *top, char **tok)
|
||||
|
||||
*tok = NULL;
|
||||
type = process_arg(event, left, &token);
|
||||
if (test_type_token(type, token, EVENT_OP, (char *)":"))
|
||||
if (test_type_token(type, token, EVENT_OP, ":"))
|
||||
goto out_free;
|
||||
|
||||
arg->op.op = token;
|
||||
@ -1065,7 +1065,7 @@ process_array(struct event *event, struct print_arg *top, char **tok)
|
||||
|
||||
*tok = NULL;
|
||||
type = process_arg(event, arg, &token);
|
||||
if (test_type_token(type, token, EVENT_OP, (char *)"]"))
|
||||
if (test_type_token(type, token, EVENT_OP, "]"))
|
||||
goto out_free;
|
||||
|
||||
top->op.right = arg;
|
||||
@ -1287,7 +1287,7 @@ process_entry(struct event *event __unused, struct print_arg *arg,
|
||||
char *field;
|
||||
char *token;
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)"->") < 0)
|
||||
if (read_expected(EVENT_OP, "->") < 0)
|
||||
return EVENT_ERROR;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token) < 0)
|
||||
@ -1447,14 +1447,14 @@ process_fields(struct event *event, struct print_flag_sym **list, char **tok)
|
||||
do {
|
||||
free_token(token);
|
||||
type = read_token_item(&token);
|
||||
if (test_type_token(type, token, EVENT_OP, (char *)"{"))
|
||||
if (test_type_token(type, token, EVENT_OP, "{"))
|
||||
break;
|
||||
|
||||
arg = malloc_or_die(sizeof(*arg));
|
||||
|
||||
free_token(token);
|
||||
type = process_arg(event, arg, &token);
|
||||
if (test_type_token(type, token, EVENT_DELIM, (char *)","))
|
||||
if (test_type_token(type, token, EVENT_DELIM, ","))
|
||||
goto out_free;
|
||||
|
||||
field = malloc_or_die(sizeof(*field));
|
||||
@ -1465,7 +1465,7 @@ process_fields(struct event *event, struct print_flag_sym **list, char **tok)
|
||||
|
||||
free_token(token);
|
||||
type = process_arg(event, arg, &token);
|
||||
if (test_type_token(type, token, EVENT_OP, (char *)"}"))
|
||||
if (test_type_token(type, token, EVENT_OP, "}"))
|
||||
goto out_free;
|
||||
|
||||
value = arg_eval(arg);
|
||||
@ -1500,13 +1500,13 @@ process_flags(struct event *event, struct print_arg *arg, char **tok)
|
||||
memset(arg, 0, sizeof(*arg));
|
||||
arg->type = PRINT_FLAGS;
|
||||
|
||||
if (read_expected_item(EVENT_DELIM, (char *)"(") < 0)
|
||||
if (read_expected_item(EVENT_DELIM, "(") < 0)
|
||||
return EVENT_ERROR;
|
||||
|
||||
field = malloc_or_die(sizeof(*field));
|
||||
|
||||
type = process_arg(event, field, &token);
|
||||
if (test_type_token(type, token, EVENT_DELIM, (char *)","))
|
||||
if (test_type_token(type, token, EVENT_DELIM, ","))
|
||||
goto out_free;
|
||||
|
||||
arg->flags.field = field;
|
||||
@ -1517,11 +1517,11 @@ process_flags(struct event *event, struct print_arg *arg, char **tok)
|
||||
type = read_token_item(&token);
|
||||
}
|
||||
|
||||
if (test_type_token(type, token, EVENT_DELIM, (char *)","))
|
||||
if (test_type_token(type, token, EVENT_DELIM, ","))
|
||||
goto out_free;
|
||||
|
||||
type = process_fields(event, &arg->flags.flags, &token);
|
||||
if (test_type_token(type, token, EVENT_DELIM, (char *)")"))
|
||||
if (test_type_token(type, token, EVENT_DELIM, ")"))
|
||||
goto out_free;
|
||||
|
||||
free_token(token);
|
||||
@ -1543,19 +1543,19 @@ process_symbols(struct event *event, struct print_arg *arg, char **tok)
|
||||
memset(arg, 0, sizeof(*arg));
|
||||
arg->type = PRINT_SYMBOL;
|
||||
|
||||
if (read_expected_item(EVENT_DELIM, (char *)"(") < 0)
|
||||
if (read_expected_item(EVENT_DELIM, "(") < 0)
|
||||
return EVENT_ERROR;
|
||||
|
||||
field = malloc_or_die(sizeof(*field));
|
||||
|
||||
type = process_arg(event, field, &token);
|
||||
if (test_type_token(type, token, EVENT_DELIM, (char *)","))
|
||||
if (test_type_token(type, token, EVENT_DELIM, ","))
|
||||
goto out_free;
|
||||
|
||||
arg->symbol.field = field;
|
||||
|
||||
type = process_fields(event, &arg->symbol.symbols, &token);
|
||||
if (test_type_token(type, token, EVENT_DELIM, (char *)")"))
|
||||
if (test_type_token(type, token, EVENT_DELIM, ")"))
|
||||
goto out_free;
|
||||
|
||||
free_token(token);
|
||||
@ -1585,7 +1585,7 @@ process_paren(struct event *event, struct print_arg *arg, char **tok)
|
||||
if (type == EVENT_ERROR)
|
||||
return EVENT_ERROR;
|
||||
|
||||
if (test_type_token(type, token, EVENT_DELIM, (char *)")")) {
|
||||
if (test_type_token(type, token, EVENT_DELIM, ")")) {
|
||||
free_token(token);
|
||||
return EVENT_ERROR;
|
||||
}
|
||||
@ -1626,7 +1626,7 @@ process_str(struct event *event __unused, struct print_arg *arg, char **tok)
|
||||
enum event_type type;
|
||||
char *token;
|
||||
|
||||
if (read_expected(EVENT_DELIM, (char *)"(") < 0)
|
||||
if (read_expected(EVENT_DELIM, "(") < 0)
|
||||
return EVENT_ERROR;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token) < 0)
|
||||
@ -1636,7 +1636,7 @@ process_str(struct event *event __unused, struct print_arg *arg, char **tok)
|
||||
arg->string.string = token;
|
||||
arg->string.offset = -1;
|
||||
|
||||
if (read_expected(EVENT_DELIM, (char *)")") < 0)
|
||||
if (read_expected(EVENT_DELIM, ")") < 0)
|
||||
return EVENT_ERROR;
|
||||
|
||||
type = read_token(&token);
|
||||
@ -1775,13 +1775,13 @@ static int event_read_print(struct event *event)
|
||||
char *token;
|
||||
int ret;
|
||||
|
||||
if (read_expected_item(EVENT_ITEM, (char *)"print") < 0)
|
||||
if (read_expected_item(EVENT_ITEM, "print") < 0)
|
||||
return -1;
|
||||
|
||||
if (read_expected(EVENT_ITEM, (char *)"fmt") < 0)
|
||||
if (read_expected(EVENT_ITEM, "fmt") < 0)
|
||||
return -1;
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
return -1;
|
||||
|
||||
if (read_expect_type(EVENT_DQUOTE, &token) < 0)
|
||||
@ -1811,8 +1811,8 @@ static int event_read_print(struct event *event)
|
||||
token = cat;
|
||||
goto concat;
|
||||
}
|
||||
|
||||
if (test_type_token(type, token, EVENT_DELIM, (char *)","))
|
||||
|
||||
if (test_type_token(type, token, EVENT_DELIM, ","))
|
||||
goto fail;
|
||||
|
||||
free_token(token);
|
||||
@ -1931,7 +1931,7 @@ static int get_common_info(const char *type, int *offset, int *size)
|
||||
}
|
||||
|
||||
static int __parse_common(void *data, int *size, int *offset,
|
||||
char *name)
|
||||
const char *name)
|
||||
{
|
||||
int ret;
|
||||
|
||||
@ -1949,7 +1949,7 @@ int trace_parse_common_type(void *data)
|
||||
static int type_size;
|
||||
|
||||
return __parse_common(data, &type_size, &type_offset,
|
||||
(char *)"common_type");
|
||||
"common_type");
|
||||
}
|
||||
|
||||
static int parse_common_pid(void *data)
|
||||
@ -1958,7 +1958,7 @@ static int parse_common_pid(void *data)
|
||||
static int pid_size;
|
||||
|
||||
return __parse_common(data, &pid_size, &pid_offset,
|
||||
(char *)"common_pid");
|
||||
"common_pid");
|
||||
}
|
||||
|
||||
static int parse_common_pc(void *data)
|
||||
@ -1967,7 +1967,7 @@ static int parse_common_pc(void *data)
|
||||
static int pc_size;
|
||||
|
||||
return __parse_common(data, &pc_size, &pc_offset,
|
||||
(char *)"common_preempt_count");
|
||||
"common_preempt_count");
|
||||
}
|
||||
|
||||
static int parse_common_flags(void *data)
|
||||
@ -1976,7 +1976,7 @@ static int parse_common_flags(void *data)
|
||||
static int flags_size;
|
||||
|
||||
return __parse_common(data, &flags_size, &flags_offset,
|
||||
(char *)"common_flags");
|
||||
"common_flags");
|
||||
}
|
||||
|
||||
static int parse_common_lock_depth(void *data)
|
||||
@ -1986,7 +1986,7 @@ static int parse_common_lock_depth(void *data)
|
||||
int ret;
|
||||
|
||||
ret = __parse_common(data, &ld_size, &ld_offset,
|
||||
(char *)"common_lock_depth");
|
||||
"common_lock_depth");
|
||||
if (ret < 0)
|
||||
return -1;
|
||||
|
||||
@ -3049,15 +3049,15 @@ static void print_args(struct print_arg *args)
|
||||
}
|
||||
}
|
||||
|
||||
static void parse_header_field(char *field,
|
||||
static void parse_header_field(const char *field,
|
||||
int *offset, int *size)
|
||||
{
|
||||
char *token;
|
||||
int type;
|
||||
|
||||
if (read_expected(EVENT_ITEM, (char *)"field") < 0)
|
||||
if (read_expected(EVENT_ITEM, "field") < 0)
|
||||
return;
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
return;
|
||||
|
||||
/* type */
|
||||
@ -3067,27 +3067,27 @@ static void parse_header_field(char *field,
|
||||
|
||||
if (read_expected(EVENT_ITEM, field) < 0)
|
||||
return;
|
||||
if (read_expected(EVENT_OP, (char *)";") < 0)
|
||||
if (read_expected(EVENT_OP, ";") < 0)
|
||||
return;
|
||||
if (read_expected(EVENT_ITEM, (char *)"offset") < 0)
|
||||
if (read_expected(EVENT_ITEM, "offset") < 0)
|
||||
return;
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
return;
|
||||
if (read_expect_type(EVENT_ITEM, &token) < 0)
|
||||
goto fail;
|
||||
*offset = atoi(token);
|
||||
free_token(token);
|
||||
if (read_expected(EVENT_OP, (char *)";") < 0)
|
||||
if (read_expected(EVENT_OP, ";") < 0)
|
||||
return;
|
||||
if (read_expected(EVENT_ITEM, (char *)"size") < 0)
|
||||
if (read_expected(EVENT_ITEM, "size") < 0)
|
||||
return;
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
return;
|
||||
if (read_expect_type(EVENT_ITEM, &token) < 0)
|
||||
goto fail;
|
||||
*size = atoi(token);
|
||||
free_token(token);
|
||||
if (read_expected(EVENT_OP, (char *)";") < 0)
|
||||
if (read_expected(EVENT_OP, ";") < 0)
|
||||
return;
|
||||
type = read_token(&token);
|
||||
if (type != EVENT_NEWLINE) {
|
||||
@ -3095,19 +3095,19 @@ static void parse_header_field(char *field,
|
||||
if (type != EVENT_ITEM)
|
||||
goto fail;
|
||||
|
||||
if (strcmp(token, (char *)"signed") != 0)
|
||||
if (strcmp(token, "signed") != 0)
|
||||
goto fail;
|
||||
|
||||
free_token(token);
|
||||
|
||||
if (read_expected(EVENT_OP, (char *)":") < 0)
|
||||
if (read_expected(EVENT_OP, ":") < 0)
|
||||
return;
|
||||
|
||||
if (read_expect_type(EVENT_ITEM, &token))
|
||||
goto fail;
|
||||
|
||||
free_token(token);
|
||||
if (read_expected(EVENT_OP, (char *)";") < 0)
|
||||
if (read_expected(EVENT_OP, ";") < 0)
|
||||
return;
|
||||
|
||||
if (read_expect_type(EVENT_NEWLINE, &token))
|
||||
@ -3121,11 +3121,11 @@ int parse_header_page(char *buf, unsigned long size)
|
||||
{
|
||||
init_input_buf(buf, size);
|
||||
|
||||
parse_header_field((char *)"timestamp", &header_page_ts_offset,
|
||||
parse_header_field("timestamp", &header_page_ts_offset,
|
||||
&header_page_ts_size);
|
||||
parse_header_field((char *)"commit", &header_page_size_offset,
|
||||
parse_header_field("commit", &header_page_size_offset,
|
||||
&header_page_size_size);
|
||||
parse_header_field((char *)"data", &header_page_data_offset,
|
||||
parse_header_field("data", &header_page_data_offset,
|
||||
&header_page_data_size);
|
||||
|
||||
return 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user