Index: main/asterisk.c =================================================================== --- main/asterisk.c (revision 117898) +++ main/asterisk.c (working copy) @@ -1342,17 +1342,17 @@ * is going to exit */ } -static const char *fix_header(char *outbuf, int maxout, const char *s, char *cmp) +static const char *fix_header(char *outbuf, int maxout, const char **s, char *cmp) { const char *c; /* Check for verboser preamble */ - if (*s == 127) { - s++; + if (**s == 127) { + (*s)++; } - if (!strncmp(s, cmp, strlen(cmp))) { - c = s + strlen(cmp); + if (!strncmp(*s, cmp, strlen(cmp))) { + c = *s + strlen(cmp); term_color(outbuf, cmp, COLOR_GRAY, 0, maxout); return c; } @@ -1364,10 +1364,10 @@ char tmp[80]; const char *c = NULL; - if ((c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_4)) || - (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_3)) || - (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_2)) || - (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_1))) { + if ((c = fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_4)) || + (c = fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_3)) || + (c = fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_2)) || + (c = fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_1))) { fputs(tmp, stdout); fputs(c, stdout); } else {