diff options
| author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-10-02 07:21:05 +0000 |
|---|---|---|
| committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-10-02 07:21:05 +0000 |
| commit | 2dd5a5896a56734589634470bdf72c6f178898e7 (patch) | |
| tree | 62258789ea9a80531d6d4d4635a4b6322881c060 | |
| parent | 910e8f9fb098eaaee8350b0edfc3338e6785607b (diff) | |
clean up merged code.
| -rw-r--r-- | usr.sbin/hoststated/parse.y | 16 | ||||
| -rw-r--r-- | usr.sbin/relayd/parse.y | 16 |
2 files changed, 22 insertions, 10 deletions
diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y index 4e91bf1646d..2b66240b3dc 100644 --- a/usr.sbin/hoststated/parse.y +++ b/usr.sbin/hoststated/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.57 2007/10/01 19:12:33 pyr Exp $ */ +/* $OpenBSD: parse.y,v 1.58 2007/10/02 07:21:04 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -848,9 +848,13 @@ marked : /* empty */ | MARKED { node.flags |= PNFLAG_MARK; } ; -nodetype : HEADER { node.type = NODE_TYPE_HEADER; } +nodetype : HEADER { + node.type = NODE_TYPE_HEADER; + } | URL { node.type = NODE_TYPE_URL; } - | COOKIE { node.type = NODE_TYPE_COOKIE; } + | COOKIE { + node.type = NODE_TYPE_COOKIE; + } | PATH { proto->flags |= F_LOOKUP_PATH; node.type = NODE_TYPE_PATH; @@ -1431,9 +1435,11 @@ top: const char *errstr = NULL; *p = '\0'; - yylval.v.number = (int)strtonum(buf, -INT_MAX, INT_MAX, &errstr); + yylval.v.number = (int)strtonum(buf, -INT_MAX, + INT_MAX, &errstr); if (errstr) { - yyerror("\"%s\" invalid number: %s", buf, errstr); + yyerror("\"%s\" invalid number: %s", + buf, errstr); return (findeol()); } return (NUMBER); diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 4e91bf1646d..2b66240b3dc 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.57 2007/10/01 19:12:33 pyr Exp $ */ +/* $OpenBSD: parse.y,v 1.58 2007/10/02 07:21:04 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -848,9 +848,13 @@ marked : /* empty */ | MARKED { node.flags |= PNFLAG_MARK; } ; -nodetype : HEADER { node.type = NODE_TYPE_HEADER; } +nodetype : HEADER { + node.type = NODE_TYPE_HEADER; + } | URL { node.type = NODE_TYPE_URL; } - | COOKIE { node.type = NODE_TYPE_COOKIE; } + | COOKIE { + node.type = NODE_TYPE_COOKIE; + } | PATH { proto->flags |= F_LOOKUP_PATH; node.type = NODE_TYPE_PATH; @@ -1431,9 +1435,11 @@ top: const char *errstr = NULL; *p = '\0'; - yylval.v.number = (int)strtonum(buf, -INT_MAX, INT_MAX, &errstr); + yylval.v.number = (int)strtonum(buf, -INT_MAX, + INT_MAX, &errstr); if (errstr) { - yyerror("\"%s\" invalid number: %s", buf, errstr); + yyerror("\"%s\" invalid number: %s", + buf, errstr); return (findeol()); } return (NUMBER); |