From patchwork Wed Aug 16 14:18:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 802092 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vMR1UmwP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xXWgM71M1z9s7h for ; Thu, 17 Aug 2017 00:19:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751944AbdHPOTL (ORCPT ); Wed, 16 Aug 2017 10:19:11 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:37225 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751637AbdHPOTL (ORCPT ); Wed, 16 Aug 2017 10:19:11 -0400 Received: by mail-pg0-f66.google.com with SMTP id 83so5374624pgb.4 for ; Wed, 16 Aug 2017 07:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sEF1ND28LSuSNpHLoj8ytHSWlxpWgoxrqVODdRddoTc=; b=vMR1UmwP73O62FfiVw6jnSQOEM7qlM8MIvomy2v6RvSOe41FCUwyBdiFTixPg807zw HSVsh/O/IW68W06La0pBvewS7CPKOeeqR9QLj14ZZRq2m/0i1u1j6qBhQkcZIwVNSjov Vso5NIeFTl/B5LXVJBfPitTzU6kc98QyORMSA95AH3CztlLlZy3honJCQZuI99N3JnK2 ZavgSrEKyrJyVDZhYT1u6dvzt16xymiGCLOAa5nr/IniCnT8nS2gVV8G0/TObT7+GYWy ilKv1KHZomXavURUFwII8lj53AWbJOpS6BXmZOWEwAeMfwADQJVroCtKT8gOgMipKLIx HjCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sEF1ND28LSuSNpHLoj8ytHSWlxpWgoxrqVODdRddoTc=; b=VSyoA/XFMxEAOyj+maNR2UOXnRZ5TYsouB/rrJQaydrtuvJ+GtcwRO3mVNKOxa94is cDTTXD4vbgxtdFeYKIvNVhiONVig0jj9d/YbJJGneA/xScBzE9Bre7ghjdYTd/6QbtUg WS+C/1fsNmxvLV8MDsDF7v8x0lUVmy2VosQhpF9c8kzfhyPMr7nhYAFuJ4npLEM3yI18 AsR5L4UNRTagLvmgKaQUMxhAkZcTQsbunD3qJQBKgP7ScdSPGJtoQayqiMgLP7x9mWHg gSRB+QLUWaWZS3hsChtyT9HOiRAlY8UoZNfM4EcG8ZhWfTSjVkTg2xqm/iSJgLr0s4jL y0Sg== X-Gm-Message-State: AHYfb5jET58p3HCq79nFPvrG8V9AL0yTIMCmQ6TCcd4zaWIRihR79B33 peBqOnMqNopb7g== X-Received: by 10.84.218.15 with SMTP id q15mr2075064pli.175.1502893150606; Wed, 16 Aug 2017 07:19:10 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5480:a76f:c73b:a161:44c4:8011]) by smtp.googlemail.com with ESMTPSA id r82sm3152219pfe.0.2017.08.16.07.19.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Aug 2017 07:19:09 -0700 (PDT) From: Varsha Rao To: pablo@netfilter.org, netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 3/5] src: cli: Remove cli_display() function. Date: Wed, 16 Aug 2017 19:48:15 +0530 Message-Id: <20170816141817.20179-4-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170816141817.20179-1-rvarsha016@gmail.com> References: <20170816141817.20179-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Remove cli_display() function, as it is not called anywhere in source code. Signed-off-by: Varsha Rao --- include/cli.h | 1 - src/cli.c | 26 -------------------------- 2 files changed, 27 deletions(-) diff --git a/include/cli.h b/include/cli.h index e577400..40fc63e 100644 --- a/include/cli.h +++ b/include/cli.h @@ -15,6 +15,5 @@ static inline int cli_init(struct nft_ctx *nft, struct mnl_socket *nf_sock, } #endif extern void cli_exit(void); -extern void cli_display(const char *fmt, va_list ap) __fmtstring(1, 0); #endif diff --git a/src/cli.c b/src/cli.c index a50fc58..d0ca9af 100644 --- a/src/cli.c +++ b/src/cli.c @@ -149,32 +149,6 @@ static char **cli_completion(const char *text, int start, int end) return NULL; } -void __fmtstring(1, 0) cli_display(const char *fmt, va_list ap) -{ - int point, end; - char *buf; - - point = rl_point; - end = rl_end; - rl_point = rl_end = 0; - - rl_save_prompt(); - rl_clear_message(); - - if (vasprintf(&buf, fmt, ap) < 0) - fprintf(rl_outstream, "cli_display: out of memory\n"); - else { - fprintf(rl_outstream, "%s\n", buf); - xfree(buf); - } - - rl_restore_prompt(); - - rl_point = point; - rl_end = end; - rl_forced_update_display(); -} - int cli_init(struct nft_ctx *nft, struct mnl_socket *nf_sock, struct nft_cache *cache, struct parser_state *_state) {