Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | This patch fixes a warning seen with gcc 4.8 (especially on ubuntu 13.10) |
| 2 | |
| 3 | | addr2line.c: In function 'handle_address': |
| 4 | | addr2line.c:450:7: error: format '%a' expects argument of type 'float *', but argument 3 has type 'char **' [-Werror=format=] |
| 5 | | if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 |
| 6 | | ^ |
| 7 | | addr2line.c:453:7: error: format '%a' expects argument of type 'float *', but argument 3 has type 'char **' [-Werror=format=] |
| 8 | | switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) |
| 9 | | ^ |
| 10 | | cc1: all warnings being treated as errors |
| 11 | |
| 12 | |
| 13 | %a is old GNU style and should be abandoned in favor of %m |
| 14 | |
| 15 | Also see |
| 16 | |
| 17 | http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54361 |
| 18 | |
| 19 | to support this assertion |
| 20 | |
| 21 | This patch is added via redhat-compatibility patch so lets revert this part |
| 22 | here. |
| 23 | |
| 24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 25 | |
| 26 | Upstream-Status: Inappropriate [Caused by an earlier patch] |
| 27 | |
| 28 | Index: elfutils-0.148/src/addr2line.c |
| 29 | =================================================================== |
| 30 | --- elfutils-0.148.orig/src/addr2line.c 2013-09-23 17:46:45.513586538 -0700 |
| 31 | +++ elfutils-0.148/src/addr2line.c 2013-09-23 17:46:46.329586558 -0700 |
| 32 | @@ -447,10 +447,10 @@ |
| 33 | bool parsed = false; |
| 34 | int i, j; |
| 35 | char *name = NULL; |
| 36 | - if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 |
| 37 | + if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 |
| 38 | && string[i] == '\0') |
| 39 | parsed = adjust_to_section (name, &addr, dwfl); |
| 40 | - switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) |
| 41 | + switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) |
| 42 | { |
| 43 | default: |
| 44 | break; |
| 45 | Index: elfutils-0.148/tests/line2addr.c |
| 46 | =================================================================== |
| 47 | --- elfutils-0.148.orig/tests/line2addr.c 2013-09-23 17:46:45.521586538 -0700 |
| 48 | +++ elfutils-0.148/tests/line2addr.c 2013-09-23 17:46:46.329586558 -0700 |
| 49 | @@ -132,7 +132,7 @@ |
| 50 | { |
| 51 | struct args a = { .arg = argv[cnt] }; |
| 52 | |
| 53 | - switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line)) |
| 54 | + switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line)) |
| 55 | { |
| 56 | default: |
| 57 | case 0: |