From patchwork Wed Sep 17 13:26:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McHardy X-Patchwork-Id: 390398 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1931B1400E0 for ; Wed, 17 Sep 2014 23:26:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755050AbaIQN0e (ORCPT ); Wed, 17 Sep 2014 09:26:34 -0400 Received: from stinky.trash.net ([213.144.137.162]:55774 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754720AbaIQN0e (ORCPT ); Wed, 17 Sep 2014 09:26:34 -0400 Received: from acer.localdomain (unknown [127.0.0.1]) by stinky.trash.net (Postfix) with ESMTP id 908189D2DC; Wed, 17 Sep 2014 15:26:32 +0200 (MEST) From: Patrick McHardy To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH] parser: compact log level grammar Date: Wed, 17 Sep 2014 15:26:31 +0200 Message-Id: <1410960391-17909-1-git-send-email-kaber@trash.net> X-Mailer: git-send-email 1.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Put rule and action on a single line as for other simple mappings. Signed-off-by: Patrick McHardy --- src/parser.y | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/src/parser.y b/src/parser.y index 653c764..be3b2e9 100644 --- a/src/parser.y +++ b/src/parser.y @@ -1316,38 +1316,14 @@ log_arg : PREFIX string } ; -level_type : LEVEL_EMERG - { - $$ = LOG_EMERG; - } - | LEVEL_ALERT - { - $$ = LOG_ALERT; - } - | LEVEL_CRIT - { - $$ = LOG_CRIT; - } - | LEVEL_ERR - { - $$ = LOG_ERR; - } - | LEVEL_WARN - { - $$ = LOG_WARNING; - } - | LEVEL_NOTICE - { - $$ = LOG_NOTICE; - } - | LEVEL_INFO - { - $$ = LOG_INFO; - } - | LEVEL_DEBUG - { - $$ = LOG_DEBUG; - } +level_type : LEVEL_EMERG { $$ = LOG_EMERG; } + | LEVEL_ALERT { $$ = LOG_ALERT; } + | LEVEL_CRIT { $$ = LOG_CRIT; } + | LEVEL_ERR { $$ = LOG_ERR; } + | LEVEL_WARN { $$ = LOG_WARNING; } + | LEVEL_NOTICE { $$ = LOG_NOTICE; } + | LEVEL_INFO { $$ = LOG_INFO; } + | LEVEL_DEBUG { $$ = LOG_DEBUG; } ; limit_stmt : LIMIT RATE NUM SLASH time_unit