comparison: src/server/config/conf.c
src/server/config/conf.c
- changeset 453
- 4586d534f9b5
- parent 415
- d938228c382e
equal
deleted
inserted
replaced
| 452:ce359a2b51fe | 453:4586d534f9b5 |
|---|---|
| 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 26 * POSSIBILITY OF SUCH DAMAGE. | 26 * POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "conf.h" | 29 #include "conf.h" |
| 30 #include "logging.h" | |
| 30 | 31 |
| 31 #include <string.h> | 32 #include <string.h> |
| 32 | 33 |
| 33 int cfg_parse_basic_file(ConfigParser *parser, FILE *in) { | 34 int cfg_parse_basic_file(ConfigParser *parser, FILE *in) { |
| 34 parser->lines_begin = NULL; | 35 parser->lines_begin = NULL; |
| 269 * parses a line containing a directive and returns a ConfigDirective object | 270 * parses a line containing a directive and returns a ConfigDirective object |
| 270 * or NULL if an error occurs | 271 * or NULL if an error occurs |
| 271 */ | 272 */ |
| 272 ConfigDirective* cfg_parse_directive(cxmutstr line, CxAllocator *mp) { | 273 ConfigDirective* cfg_parse_directive(cxmutstr line, CxAllocator *mp) { |
| 273 if(line.length < 6) { | 274 if(line.length < 6) { |
| 274 log_ereport(LOG_FAILURE, "cfg_parse_directive: line too short"); | 275 ws_cfg_log(LOG_FAILURE, "cfg_parse_directive: line too short"); |
| 275 return NULL; // line too short | 276 return NULL; // line too short |
| 276 } | 277 } |
| 277 | 278 |
| 278 cxstring name; | 279 cxstring name; |
| 279 | 280 |
