diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch')
| -rw-r--r-- | package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch b/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch deleted file mode 100644 index c0af0c629..000000000 --- a/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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, |