Mercurial > hg > freeDiameter
diff extensions/rt_ereg/rtereg_conf.l @ 974:2091bf698fb1
Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR
(as far as sed could find them)
with manual fixing afterwards.
| author | Thomas Klausner <tk@giga.or.at> |
|---|---|
| date | Thu, 14 Mar 2013 18:14:35 +0100 |
| parents | d59decafe9c0 |
| children | 1af09cc156d6 |
line wrap: on
line diff
--- a/extensions/rt_ereg/rtereg_conf.l Thu Mar 14 17:31:16 2013 +0100 +++ b/extensions/rt_ereg/rtereg_conf.l Thu Mar 14 18:14:35 2013 +0100 @@ -80,7 +80,7 @@ /* Match a quoted string. */ CHECK_MALLOC_DO( yylval->string = strdup(yytext+1), { - TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s\n", yytext, strerror(errno)); + TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s", yytext, strerror(errno)); return LEX_ERROR; /* trig an error in yacc parser */ } ); yylval->string[strlen(yytext) - 2] = '\0'; @@ -95,7 +95,7 @@ ret = sscanf(yytext, "%i", &yylval->integer); if (ret != 1) { /* No matching: an error occurred */ - fd_log_debug("Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno)); + fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); return LEX_ERROR; /* trig an error in yacc parser */ /* Maybe we could REJECT instead of failing here? */ } @@ -112,7 +112,7 @@ /* Unrecognized sequence, if it did not match any previous pattern */ [^[:space:]\":=+;\n]+ { - fd_log_debug("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext); + fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); return LEX_ERROR; }