38c38
< ELFTC_VCSID("$Id: cxxfilt.c 3174 2015-03-27 17:13:41Z emaste $");
---
> ELFTC_VCSID("$Id: cxxfilt.c 3356 2016-01-22 22:31:38Z jkoshy $");
115c115
< demangle(char *name, int strict, int *pos)
---
> demangle(char *name, int strict, size_t *pos)
119c119
< int p, t;
---
> size_t p, t;
131c131
< if (p <= 0)
---
> if (p == 0)
134c134
< while (elftc_demangle(nb, dem, sizeof(dem), format) < 0) {
---
> while (elftc_demangle(nb, dem, sizeof(dem), (unsigned) format) < 0) {
152c152,153
< int c, i, p, s, opt;
---
> size_t i, p, s;
> int c, n, opt;
185,187c186,188
< for (i = 0; i < argc; i++) {
< if ((dem = demangle(argv[i], 1, NULL)) == NULL)
< fprintf(stderr, "Failed: %s\n", argv[i]);
---
> for (n = 0; n < argc; n++) {
> if ((dem = demangle(argv[n], 1, NULL)) == NULL)
> fprintf(stderr, "Failed: %s\n", argv[n]);
216c217
< buf[p++] = c;
---
> buf[p++] = (char) c;