From patchwork Thu Aug 24 17:14:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 805579 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 3xdWBF1KLGz9rxm for ; Fri, 25 Aug 2017 03:14:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753698AbdHXROo (ORCPT ); Thu, 24 Aug 2017 13:14:44 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:50681 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753416AbdHXROo (ORCPT ); Thu, 24 Aug 2017 13:14:44 -0400 Received: from mail.nwl.cc (orbyte.nwl.cc [127.0.0.1]) by mail.nwl.cc (Postfix) with ESMTP id 5F3DF63860; Thu, 24 Aug 2017 19:14:43 +0200 (CEST) Received: from xsao (localhost [IPv6:::1]) by mail.nwl.cc (Postfix) with ESMTP id 43A036385D; Thu, 24 Aug 2017 19:14:43 +0200 (CEST) From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nft PATCH 2/4] scanner: Fix for wrong parameter type of scanner_destroy() Date: Thu, 24 Aug 2017 19:14:11 +0200 Message-Id: <20170824171413.31737-3-phil@nwl.cc> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170824171413.31737-1-phil@nwl.cc> References: <20170824171413.31737-1-phil@nwl.cc> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The function takes the scanner as argument, not the state. This wasn't a real issue since scanner is a void pointer, which means it's only casted around without need. So this fix is a rather cosmetic one. Signed-off-by: Phil Sutter --- include/parser.h | 2 +- src/scanner.l | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/parser.h b/include/parser.h index 0e266d60b8a31..431edfb3d4e34 100644 --- a/include/parser.h +++ b/include/parser.h @@ -37,7 +37,7 @@ extern void parser_init(struct mnl_socket *nf_sock, struct nft_cache *cache, extern int nft_parse(struct nft_ctx *ctx, void *, struct parser_state *state); extern void *scanner_init(struct parser_state *state); -extern void scanner_destroy(struct parser_state *state); +extern void scanner_destroy(void *scanner); extern int scanner_read_file(void *scanner, const char *filename, const struct location *loc); diff --git a/src/scanner.l b/src/scanner.l index 25e4eb1c70ec1..7d57cc1465d3a 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -856,7 +856,7 @@ void *scanner_init(struct parser_state *state) return scanner; } -void scanner_destroy(struct parser_state *scanner) +void scanner_destroy(void *scanner) { struct parser_state *state = yyget_extra(scanner);