diff options
author | James <> | 2013-03-17 12:16:37 +0000 |
---|---|---|
committer | James <> | 2013-03-17 12:16:37 +0000 |
commit | 27b76ab0671089c47506615a796a261e993896a7 (patch) | |
tree | 61213d67e7fa87b20356b23798558e2c4212c42f /package/devel/trace-cmd/patches | |
download | trunk-36060-27b76ab0671089c47506615a796a261e993896a7.tar.gz trunk-36060-27b76ab0671089c47506615a796a261e993896a7.tar.bz2 trunk-36060-27b76ab0671089c47506615a796a261e993896a7.zip |
Diffstat (limited to 'package/devel/trace-cmd/patches')
5 files changed, 196 insertions, 0 deletions
diff --git a/package/devel/trace-cmd/patches/.svn/entries b/package/devel/trace-cmd/patches/.svn/entries new file mode 100644 index 0000000..784671a --- /dev/null +++ b/package/devel/trace-cmd/patches/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +36060 +svn://svn.openwrt.org/openwrt/trunk/package/devel/trace-cmd/patches +svn://svn.openwrt.org/openwrt + + + +2012-10-29T19:25:43.127587Z +34002 +nbd + + + + + + + + + + + + + + +3c298f89-4303-0410-b956-a3cf2f4a3e73 + +100-compile_fix.patch +file + + + + +2013-03-17T12:13:21.000000Z +281431187e241123c6221e9911262a8a +2012-10-29T19:25:43.127587Z +34002 +nbd + + + + + + + + + + + + + + + + + + + + + +652 + +110-fix_sscanf_alloc.patch +file + + + + +2013-03-17T12:13:21.000000Z +0c5ea93585cdaf423ace452f713af757 +2012-10-29T19:25:43.127587Z +34002 +nbd + + + + + + + + + + + + + + + + + + + + + +671 + diff --git a/package/devel/trace-cmd/patches/.svn/text-base/100-compile_fix.patch.svn-base b/package/devel/trace-cmd/patches/.svn/text-base/100-compile_fix.patch.svn-base new file mode 100644 index 0000000..151c123 --- /dev/null +++ b/package/devel/trace-cmd/patches/.svn/text-base/100-compile_fix.patch.svn-base @@ -0,0 +1,30 @@ +--- a/event-utils.h ++++ b/event-utils.h +@@ -22,6 +22,7 @@ + + #include <string.h> + #include <ctype.h> ++#include <stdarg.h> + + /* Can be overridden */ + void die(const char *fmt, ...); +--- a/trace-listen.c ++++ b/trace-listen.c +@@ -17,6 +17,7 @@ + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ ++#define _GNU_SOURCE + #define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> +--- a/trace-record.c ++++ b/trace-record.c +@@ -17,6 +17,7 @@ + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ ++#define _GNU_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/package/devel/trace-cmd/patches/.svn/text-base/110-fix_sscanf_alloc.patch.svn-base b/package/devel/trace-cmd/patches/.svn/text-base/110-fix_sscanf_alloc.patch.svn-base new file mode 100644 index 0000000..c0af0c6 --- /dev/null +++ b/package/devel/trace-cmd/patches/.svn/text-base/110-fix_sscanf_alloc.patch.svn-base @@ -0,0 +1,20 @@ +--- a/trace-util.c ++++ b/trace-util.c +@@ -110,7 +110,7 @@ void parse_cmdlines(struct pevent *peven + + line = strtok_r(file, "\n", &next); + while (line) { +- sscanf(line, "%d %as", &pid, ++ sscanf(line, "%d %ms", &pid, + (float *)(void *)&comm); /* workaround gcc warning */ + pevent_register_comm(pevent, comm, pid); + free(comm); +@@ -133,7 +133,7 @@ void parse_proc_kallsyms(struct pevent * + line = strtok_r(file, "\n", &next); + while (line) { + mod = NULL; +- ret = sscanf(line, "%as %c %as\t[%as", ++ ret = sscanf(line, "%ms %c %ms\t[%ms", + (float *)(void *)&addr_str, /* workaround gcc warning */ + &ch, + (float *)(void *)&func, diff --git a/package/devel/trace-cmd/patches/100-compile_fix.patch b/package/devel/trace-cmd/patches/100-compile_fix.patch new file mode 100644 index 0000000..151c123 --- /dev/null +++ b/package/devel/trace-cmd/patches/100-compile_fix.patch @@ -0,0 +1,30 @@ +--- a/event-utils.h ++++ b/event-utils.h +@@ -22,6 +22,7 @@ + + #include <string.h> + #include <ctype.h> ++#include <stdarg.h> + + /* Can be overridden */ + void die(const char *fmt, ...); +--- a/trace-listen.c ++++ b/trace-listen.c +@@ -17,6 +17,7 @@ + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ ++#define _GNU_SOURCE + #define _LARGEFILE64_SOURCE + #include <dirent.h> + #include <stdio.h> +--- a/trace-record.c ++++ b/trace-record.c +@@ -17,6 +17,7 @@ + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ ++#define _GNU_SOURCE + #include <dirent.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch b/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch new file mode 100644 index 0000000..c0af0c6 --- /dev/null +++ b/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch @@ -0,0 +1,20 @@ +--- a/trace-util.c ++++ b/trace-util.c +@@ -110,7 +110,7 @@ void parse_cmdlines(struct pevent *peven + + line = strtok_r(file, "\n", &next); + while (line) { +- sscanf(line, "%d %as", &pid, ++ sscanf(line, "%d %ms", &pid, + (float *)(void *)&comm); /* workaround gcc warning */ + pevent_register_comm(pevent, comm, pid); + free(comm); +@@ -133,7 +133,7 @@ void parse_proc_kallsyms(struct pevent * + line = strtok_r(file, "\n", &next); + while (line) { + mod = NULL; +- ret = sscanf(line, "%as %c %as\t[%as", ++ ret = sscanf(line, "%ms %c %ms\t[%ms", + (float *)(void *)&addr_str, /* workaround gcc warning */ + &ch, + (float *)(void *)&func, |