Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 158296
b: refs/heads/master
c: 65014ab
h: refs/heads/master
v: v3
  • Loading branch information
Ingo Molnar committed Sep 2, 2009
1 parent 53c61b3 commit 7a6c43f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 61562445c80452ec417fb6a6895b991f6c1dd930
refs/heads/master: 65014ab36196f6d86edc9ee23759d6930b9d89a8
2 changes: 1 addition & 1 deletion trunk/tools/perf/util/trace-event-info.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ int bigendian(void)
unsigned char str[] = { 0x1, 0x2, 0x3, 0x4, 0x0, 0x0, 0x0, 0x0};
unsigned int *ptr;

ptr = (unsigned int *)str;
ptr = (unsigned int *)(void *)str;
return *ptr == 0x01020304;
}

Expand Down
12 changes: 6 additions & 6 deletions trunk/tools/perf/util/trace-event-parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void parse_cmdlines(char *file, int size __unused)
while (line) {
item = malloc_or_die(sizeof(*item));
sscanf(line, "%d %as", &item->pid,
(float *)&item->comm); /* workaround gcc warning */
(float *)(void *)&item->comm); /* workaround gcc warning */
item->next = list;
list = item;
line = strtok_r(NULL, "\n", &next);
Expand Down Expand Up @@ -152,10 +152,10 @@ void parse_proc_kallsyms(char *file, unsigned int size __unused)
item = malloc_or_die(sizeof(*item));
item->mod = NULL;
ret = sscanf(line, "%as %c %as\t[%as",
(float *)&addr_str, /* workaround gcc warning */
(float *)(void *)&addr_str, /* workaround gcc warning */
&ch,
(float *)&item->func,
(float *)&item->mod);
(float *)(void *)&item->func,
(float *)(void *)&item->mod);
item->addr = strtoull(addr_str, NULL, 16);
free(addr_str);

Expand Down Expand Up @@ -291,8 +291,8 @@ void parse_ftrace_printk(char *file, unsigned int size __unused)
while (line) {
item = malloc_or_die(sizeof(*item));
ret = sscanf(line, "%as : %as",
(float *)&addr_str, /* workaround gcc warning */
(float *)&item->printk);
(float *)(void *)&addr_str, /* workaround gcc warning */
(float *)(void *)&item->printk);
item->addr = strtoull(addr_str, NULL, 16);
free(addr_str);

Expand Down

0 comments on commit 7a6c43f

Please sign in to comment.