From patchwork Sat Aug 19 15:24:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Leblond X-Patchwork-Id: 803570 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xZNzf2n4yz9sQl for ; Sun, 20 Aug 2017 01:24:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751679AbdHSPYp (ORCPT ); Sat, 19 Aug 2017 11:24:45 -0400 Received: from home.regit.org ([37.187.126.138]:33634 "EHLO home.regit.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751644AbdHSPYn (ORCPT ); Sat, 19 Aug 2017 11:24:43 -0400 Received: from [2a01:e34:ee97:b130:c685:8ff:feb3:c9c8] (helo=localhost.localdomain) by home.regit.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1dj5cA-0001ro-0a; Sat, 19 Aug 2017 17:24:42 +0200 From: Eric Leblond To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Eric Leblond Subject: [PATH nft v2 08/18] libnftables: add missing variables to library Date: Sat, 19 Aug 2017 17:24:10 +0200 Message-Id: <20170819152420.22563-9-eric@regit.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170819152420.22563-1-eric@regit.org> References: <20170819152420.22563-1-eric@regit.org> X-Spam-Score: -1.0 (-) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch also avoids double definition of global vars. Signed-off-by: Eric Leblond --- src/libnftables.c | 2 ++ src/main.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libnftables.c b/src/libnftables.c index 446ec1e..28f9272 100644 --- a/src/libnftables.c +++ b/src/libnftables.c @@ -33,6 +33,8 @@ unsigned int handle_output; unsigned int debug_level; #endif +const char *include_paths[INCLUDE_PATHS_MAX] = { DEFAULT_INCLUDE_PATH }; + void nft_global_init(void) { mark_table_init(); diff --git a/src/main.c b/src/main.c index 9b4e450..7ab01b7 100644 --- a/src/main.c +++ b/src/main.c @@ -29,12 +29,6 @@ #include #include -unsigned int max_errors = 10; -#ifdef DEBUG -unsigned int debug_level; -#endif - -const char *include_paths[INCLUDE_PATHS_MAX] = { DEFAULT_INCLUDE_PATH }; static unsigned int num_include_paths = 1; enum opt_vals {