Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 323643
b: refs/heads/master
c: 0cf2601
h: refs/heads/master
i:
  323641: 1824e8a
  323639: e6d5859
v: v3
  • Loading branch information
Robert Richter authored and Arnaldo Carvalho de Melo committed Aug 8, 2012
1 parent 828fb73 commit fa456fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: b527bab59be7ca2154f644fcc4b9e3c267a6d855
refs/heads/master: 0cf260131c52f681533d17db6fd07545a3dc184e
3 changes: 2 additions & 1 deletion trunk/tools/lib/traceevent/event-parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <stdarg.h>
#include <ctype.h>
#include <errno.h>
#include <stdint.h>

#include "event-parse.h"
#include "event-utils.h"
Expand Down Expand Up @@ -3485,7 +3486,7 @@ process_defined_func(struct trace_seq *s, void *data, int size,
if (!string->str)
die("malloc str");

args[i] = (unsigned long long)string->str;
args[i] = (uintptr_t)string->str;
strings = string;
trace_seq_destroy(&str);
break;
Expand Down

0 comments on commit fa456fb

Please sign in to comment.