diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-07-05 09:42:27 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-07-05 09:42:27 +0000 |
| commit | d8990b18ec56ffc5caec0c113659dd7c03a96437 (patch) | |
| tree | 823814c62609935c0cd3bdd4c444dced9025a22f /usr.sbin/relayd/parse.y | |
| parent | 4790337fbc0493a78960b1951a62efb87eb07779 (diff) | |
use a more traditional while() instead of for() for getopt().
sync usage() to the man page.
format string fixes.
complain about failed calloc()'s instead of exiting silently.
ok pry@,reyk@
Diffstat (limited to 'usr.sbin/relayd/parse.y')
| -rw-r--r-- | usr.sbin/relayd/parse.y | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 637b76175ed..65be41149af 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.49 2007/05/31 18:58:09 pyr Exp $ */ +/* $OpenBSD: parse.y,v 1.50 2007/07/05 09:42:26 thib Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -158,7 +158,7 @@ http_type : STRING { } else if (strcmp("http", $1) == 0) { $$ = 0; } else { - yyerror("invalid check type: $1", $1); + yyerror("invalid check type: %s", $1); free($1); YYERROR; } @@ -171,7 +171,7 @@ proto_type : TCP { $$ = RELAY_PROTO_TCP; } if (strcmp("http", $1) == 0) { $$ = RELAY_PROTO_HTTP; } else { - yyerror("invalid protocol type: $1", $1); + yyerror("invalid protocol type: %s", $1); free($1); YYERROR; } @@ -396,7 +396,7 @@ table : TABLE STRING { if (!strcmp(tb->conf.name, $2)) break; if (tb != NULL) { - yyerror("table %s defined twice"); + yyerror("table %s defined twice", $2); free($2); YYERROR; } @@ -1415,8 +1415,10 @@ parse_config(const char *filename, int opts) if ((conf = calloc(1, sizeof(*conf))) == NULL || (conf->tables = calloc(1, sizeof(*conf->tables))) == NULL || - (conf->services = calloc(1, sizeof(*conf->services))) == NULL) + (conf->services = calloc(1, sizeof(*conf->services))) == NULL) { + warn("cannot allocate memory"); return (NULL); + } last_host_id = last_table_id = last_service_id = last_proto_id = last_relay_id = 0; |