Mercurial > hg > freeDiameter
comparison extensions/acl_wl/aw_conf.y @ 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 | d95cd3ca9e8d |
| children | 1c6c8fa622ff |
comparison
equal
deleted
inserted
replaced
| 973:60949d03d17a | 974:2091bf698fb1 |
|---|---|
| 71 TRACE_DEBUG (FULL, "Parsing configuration file: %s...", conffile); | 71 TRACE_DEBUG (FULL, "Parsing configuration file: %s...", conffile); |
| 72 | 72 |
| 73 aw_confin = fopen(conffile, "r"); | 73 aw_confin = fopen(conffile, "r"); |
| 74 if (aw_confin == NULL) { | 74 if (aw_confin == NULL) { |
| 75 ret = errno; | 75 ret = errno; |
| 76 fd_log_debug("Unable to open extension configuration file %s for reading: %s\n", conffile, strerror(ret)); | 76 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); |
| 77 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); | 77 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); |
| 78 return ret; | 78 return ret; |
| 79 } | 79 } |
| 80 | 80 |
| 81 ret = yyparse(conffile); | 81 ret = yyparse(conffile); |
| 99 void yyerror (YYLTYPE *ploc, char * conffile, char const *s) | 99 void yyerror (YYLTYPE *ploc, char * conffile, char const *s) |
| 100 { | 100 { |
| 101 TRACE_DEBUG(INFO, "Error in configuration parsing"); | 101 TRACE_DEBUG(INFO, "Error in configuration parsing"); |
| 102 | 102 |
| 103 if (ploc->first_line != ploc->last_line) | 103 if (ploc->first_line != ploc->last_line) |
| 104 fd_log_debug("%s:%d.%d-%d.%d : %s\n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); | 104 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); |
| 105 else if (ploc->first_column != ploc->last_column) | 105 else if (ploc->first_column != ploc->last_column) |
| 106 fd_log_debug("%s:%d.%d-%d : %s\n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); | 106 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); |
| 107 else | 107 else |
| 108 fd_log_debug("%s:%d.%d : %s\n", conffile, ploc->first_line, ploc->first_column, s); | 108 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); |
| 109 } | 109 } |
| 110 | 110 |
| 111 %} | 111 %} |
| 112 | 112 |
| 113 /* In case of error in the lexical analysis */ | 113 /* In case of error in the lexical analysis */ |