From patchwork Thu Nov 15 22:36:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998586 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="kgNiKh43"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7Q5jkwz9s9G for ; Fri, 16 Nov 2018 09:37:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389111AbeKPIqs (ORCPT ); Fri, 16 Nov 2018 03:46:48 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:32832 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389029AbeKPIqs (ORCPT ); Fri, 16 Nov 2018 03:46:48 -0500 Received: by mail-pg1-f193.google.com with SMTP id z11so7021051pgu.0 for ; Thu, 15 Nov 2018 14:37:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F8CTv03m2uHt78WJ99qwaBb/52d6Tz2VP7bbUFWyVFk=; b=kgNiKh43XaFeYS+KAItg9SXO7pdpktimmpZ89WLyNE0JYdI0Y4pkOISKjqJ+31mVFx qGv6T78C6OMEV5bZpNn8PewkRXIqqaFpx9AMVm1/utvZaqGdoYtW1oq6IWywf50hrYdv CdHbYaAGzuJA2DpE7pKmckFyWOR67MZjyrt3hePbngDTfciEdIHgNJsvJbiwPEQSn9aR E9MORUMofROXM2nnAftIT1G/sNLAkq0kKeBh5bCD9kxrCRRZxVkhyPok0xJ6SasUmWS4 PFR0pSjHvCbaHdGLIJ38VNTT0vGRqCNoHDf+Sq8BKDAFbvt/DamZjj/URiJnoM+RJ0jS svPA== 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=F8CTv03m2uHt78WJ99qwaBb/52d6Tz2VP7bbUFWyVFk=; b=I9ZO+ewrk5g5o84LMiyX2LDDQTJQo5fMQMer9D0SHDIXadLf71+pjt2c9+7gQUVZDi z+Y8nE2ELns3W0qVy4VU1RnsHhYZaPQcukzAmjdVd4IsJ8Wv0o4N1yey4P1LEB4xULJs 4xeQIHlpHUgC8LmGcLH+vbOk65R4v1jwFLicCgG1Gh9if3WO3fE8JnZIFbXZ1imNxalh deE+peDC2XOP2eBGDC120dd40wVwFqWFM2xubFlNLEHoXZ8TtKlS9J61HCRhxv+9pjqR 8GZJj47oh9eQe7kwxIzRHO3k23ESQAnqhcpi7MRnLxTT5vkMjj12S0PFIQDPOL5rmCeK 2bpA== X-Gm-Message-State: AGRZ1gIMTXrylQu0LubxtxgvZOqo/43nSvcND07LiOxoCiWBePxtruWo KxMLdK4zLc4Gby4ENlGFABO5w3tYnfSeGQ== X-Google-Smtp-Source: AJdET5ePK0ouCoL4L269kJeDmdHKmvOJVu/MJYuiv9vFBy26xzHdiEzkNGJ9qGPzLsA6F1DZiDkzRA== X-Received: by 2002:a63:40c6:: with SMTP id n189mr7401455pga.355.1542321424334; Thu, 15 Nov 2018 14:37:04 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.37.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:37:03 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 22/22] rdma: make local functions static Date: Thu, 15 Nov 2018 14:36:40 -0800 Message-Id: <20181115223640.411-23-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115223640.411-1-stephen@networkplumber.org> References: <20181115223640.411-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Several functions only used inside utils.c Signed-off-by: Stephen Hemminger --- rdma/rdma.h | 11 ----------- rdma/utils.c | 12 ++++++------ 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/rdma/rdma.h b/rdma/rdma.h index c3b7530b6cc7..05c3c69b07fd 100644 --- a/rdma/rdma.h +++ b/rdma/rdma.h @@ -74,13 +74,6 @@ struct rd_cmd { int (*func)(struct rd *rd); }; -/* - * Parser interface - */ -bool rd_no_arg(struct rd *rd); -void rd_arg_inc(struct rd *rd); - -char *rd_argv(struct rd *rd); /* * Commands interface @@ -95,8 +88,6 @@ void rd_free(struct rd *rd); int rd_set_arg_to_devname(struct rd *rd); int rd_argc(struct rd *rd); -int strcmpx(const char *str1, const char *str2); - /* * Device manipulation */ @@ -117,14 +108,12 @@ int rd_recv_msg(struct rd *rd, mnl_cb_t callback, void *data, uint32_t seq); void rd_prepare_msg(struct rd *rd, uint32_t cmd, uint32_t *seq, uint16_t flags); int rd_dev_init_cb(const struct nlmsghdr *nlh, void *data); int rd_attr_cb(const struct nlattr *attr, void *data); -int rd_attr_check(const struct nlattr *attr, int *typep); /* * Print helpers */ void print_driver_table(struct rd *rd, struct nlattr *tb); void newline(struct rd *rd); -void newline_indent(struct rd *rd); #define MAX_LINE_LENGTH 80 #endif /* _RDMA_TOOL_H_ */ diff --git a/rdma/utils.c b/rdma/utils.c index 4840bf226d54..1a0cf56800d4 100644 --- a/rdma/utils.c +++ b/rdma/utils.c @@ -18,14 +18,14 @@ int rd_argc(struct rd *rd) return rd->argc; } -char *rd_argv(struct rd *rd) +static char *rd_argv(struct rd *rd) { if (!rd_argc(rd)) return NULL; return *rd->argv; } -int strcmpx(const char *str1, const char *str2) +static int strcmpx(const char *str1, const char *str2) { if (strlen(str1) > strlen(str2)) return -1; @@ -39,7 +39,7 @@ static bool rd_argv_match(struct rd *rd, const char *pattern) return strcmpx(rd_argv(rd), pattern) == 0; } -void rd_arg_inc(struct rd *rd) +static void rd_arg_inc(struct rd *rd) { if (!rd_argc(rd)) return; @@ -47,7 +47,7 @@ void rd_arg_inc(struct rd *rd) rd->argv++; } -bool rd_no_arg(struct rd *rd) +static bool rd_no_arg(struct rd *rd) { return rd_argc(rd) == 0; } @@ -404,7 +404,7 @@ static const enum mnl_attr_data_type nldev_policy[RDMA_NLDEV_ATTR_MAX] = { [RDMA_NLDEV_ATTR_DRIVER_U64] = MNL_TYPE_U64, }; -int rd_attr_check(const struct nlattr *attr, int *typep) +static int rd_attr_check(const struct nlattr *attr, int *typep) { int type; @@ -696,7 +696,7 @@ void newline(struct rd *rd) pr_out("\n"); } -void newline_indent(struct rd *rd) +static void newline_indent(struct rd *rd) { newline(rd); if (!rd->json_output)