From patchwork Thu Nov 15 22:36:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998573 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="gzscnyOv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx750hRKz9s9G for ; Fri, 16 Nov 2018 09:36:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727194AbeKPIq3 (ORCPT ); Fri, 16 Nov 2018 03:46:29 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:42812 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbeKPIq2 (ORCPT ); Fri, 16 Nov 2018 03:46:28 -0500 Received: by mail-pl1-f194.google.com with SMTP id x21-v6so7423209pln.9 for ; Thu, 15 Nov 2018 14:36:45 -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=UPQF9cHU9nTz/fE5zRrTdVEYoPsisPrQ712UpM2Lnt0=; b=gzscnyOv3xCnHbweZbLYf0XRFWM/GOVLGHoT78V3V5DD8Z0Y9r+45u559LNv9KjNBz 8/WExNzJY4wY8L8CxAtEmqCy9nPiGxnIDCJBkW6oPeu4EKNXxTPL8bJ4uuBgbfqDZNjG +Q1HqFkgQ1TQI4UXCi8Qi9Hy0VBBAbbCDxF64OqyFmaaAyOlBuWzgZq2l1xRSLPRk3ed sNsm6Lz8O6eX/Bfiox21wSrFbTD/+5m5m4croJO7/X6Y3AgguKDl8vP/IPEdcThkqzoV LyFS1Dtlu3YSSQHs4ZPVz+Fikf3tqqkKs5aUXeMIWSSF1KS5cqVVGmkZLJrHtT4Hp4qD w9DA== 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=UPQF9cHU9nTz/fE5zRrTdVEYoPsisPrQ712UpM2Lnt0=; b=BzHAiCFPxbY/Sk22pYeCY2WOPbfvBohJMilsmmRNdfj1H54dt+JchBdY95yq0AcDHK Gr5yV1FbWt0oZomWgqsENLGdKzgMO8t28w6mgXYQLD3kwlczLExMgVmGOiWHtZuJCY1G N+cjWkbNxLfD6RPgZmUisGrUiaaeMLS1T5wyEuYDaPRTP4jUbMhOdgEBlyY5dgp8ngQm cpXJFbrrmQb3LpLOzKPgacBPMlqc398zx3Nt7jwz4iryIfYv9nC5GEPgfQjuJU8kEnM1 5xJ1P5sGSSyWY4bTaGVewsKlBGJbuxAdTRCHJR+ABqGthyNcdcWlWpu8zQL0eCjlNZvi 7YUQ== X-Gm-Message-State: AGRZ1gK6u6o3gynB8YM8xr6s6Jw9DsPdul4YCXBrovaDJbJEBFuu2dT7 G22qAyXY21xAfSBqMONdZntb2gVuHVY7xw== X-Google-Smtp-Source: AJdET5cV8PSWj9bUCVB1g2x+2rqHDCapSMxORxC8/9eZoWIY75mI/a2JKmhRyC1Dc0HMoRM7otQ5zQ== X-Received: by 2002:a17:902:8d83:: with SMTP id v3-v6mr8203254plo.162.1542321404385; Thu, 15 Nov 2018 14:36:44 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:43 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 01/22] lib/ll_addr: whitespace and indent cleanup Date: Thu, 15 Nov 2018 14:36:19 -0800 Message-Id: <20181115223640.411-2-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 Run old ll_addr through kernel Lindent. Signed-off-by: Stephen Hemminger --- lib/ll_addr.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/ll_addr.c b/lib/ll_addr.c index 84de64e2e053..00b562aeda22 100644 --- a/lib/ll_addr.c +++ b/lib/ll_addr.c @@ -26,20 +26,20 @@ #include "rt_names.h" #include "utils.h" - -const char *ll_addr_n2a(const unsigned char *addr, int alen, int type, char *buf, int blen) +const char *ll_addr_n2a(const unsigned char *addr, int alen, int type, + char *buf, int blen) { int i; int l; if (alen == 4 && - (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)) { + (type == ARPHRD_TUNNEL || type == ARPHRD_SIT + || type == ARPHRD_IPGRE)) return inet_ntop(AF_INET, addr, buf, blen); - } - if (alen == 16 && - (type == ARPHRD_TUNNEL6 || type == ARPHRD_IP6GRE)) { + + if (alen == 16 && (type == ARPHRD_TUNNEL6 || type == ARPHRD_IP6GRE)) return inet_ntop(AF_INET6, addr, buf, blen); - } + snprintf(buf, blen, "%02x", addr[0]); for (i = 1, l = 2; i < alen && l < blen; i++, l += 3) snprintf(buf + l, blen - l, ":%02x", addr[i]); @@ -62,7 +62,7 @@ int ll_addr_a2n(char *lladdr, int len, const char *arg) } else { int i; - for (i=0; i 255) { - fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); + fprintf(stderr, "\"%s\" is invalid lladdr.\n", + arg); return -1; } lladdr[i] = temp; @@ -82,6 +84,6 @@ int ll_addr_a2n(char *lladdr, int len, const char *arg) break; arg = cp; } - return i+1; + return i + 1; } } From patchwork Thu Nov 15 22:36:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998574 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="rcJ5Mzq/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx755YR8z9s3q for ; Fri, 16 Nov 2018 09:36:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729316AbeKPIqb (ORCPT ); Fri, 16 Nov 2018 03:46:31 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40927 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbeKPIqa (ORCPT ); Fri, 16 Nov 2018 03:46:30 -0500 Received: by mail-pf1-f193.google.com with SMTP id x2-v6so10371240pfm.7 for ; Thu, 15 Nov 2018 14:36:46 -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=uSha1PcZ2o/cR7tjsgIlsU/9L9Vi782COeGWNA9rYPc=; b=rcJ5Mzq/qX6wQGaKaDVGXaSJ3UVkiiC94SkFQJ84uYA0dMS9gmMSUIIfp4TOnEkDT7 B41i8/PsqGEph1+4KmuwwBiG+ma074EN66bu8OTUpMLTxfR/QkxB7Ya8bLODnZjpW02J LLBlq7I4cNcgOnTFrOnMqGijvP0Cjqdl2QdVUkef0M2r5Kjh7v39z6Uu3+NEo0g0+ZoE TcAN7x3S35K8GSc4NoycQsih3yQCEw2ob1y8fcK4r05TpbuTtlD/GTHvnomI6/36cS4W Q5avMaAgfSALCdNGK0AE0mqH/a5Jkc20I1Vo1dgc8B5fAB2kYwSQhhmMWm/O0R5+w+Df jL/w== 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=uSha1PcZ2o/cR7tjsgIlsU/9L9Vi782COeGWNA9rYPc=; b=XrNZfzcdy7RH4EEWv7jvGGspooc6kWPAqNZpDR/MoTNH6xT1nbpK9z4wVdgqpLQgVR g5u+EItKTWltsGeXmsWtgE4aNNNYOCP85DkBtjCWpEOVyaiXlfdPxi0FkDa/lDTDHXi+ fKMIc+knPZ3R/2vbCxtSUBXtXY3G/Lw3v55xuqiihAJ2JuIdN8tQNesCHyOrYjNjDtls ymhymw8y+yWnQ8I4lTC5ARBkeAX3z217703ZswgHUHUvcLVtNqudjQN15n0Ssf4oiZZj 9h/wLIab4lfA8q/NCj4PWZopTe0pt7ZohfaBK3C6qagk/hsoKto8ei1hTteLKKAK4FIv I8ow== X-Gm-Message-State: AGRZ1gI5b1Iwzqze3vlxMC832ix0uzaskJeB9Qv0bTAbU3EWY2cSCs6w yr5ogg3bHNWSq96P8ls57qHZX3EB1smEXQ== X-Google-Smtp-Source: AJdET5cI8IiQP8R4wfjIeLlVFPfMHAZDOr6SMV0I//0DX9BcUUKjtEsBUQQYZNnwpVf7jgOEtLzUdw== X-Received: by 2002:a63:6b08:: with SMTP id g8mr7480618pgc.119.1542321405276; Thu, 15 Nov 2018 14:36:45 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:44 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 02/22] lib/utils: make local functions static Date: Thu, 15 Nov 2018 14:36:20 -0800 Message-Id: <20181115223640.411-3-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 Some of the print/parsing is only used internally. Drop unused get_s8/get_s16. Signed-off-by: Stephen Hemminger --- include/utils.h | 5 ----- lib/utils.c | 48 +++++++----------------------------------------- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/include/utils.h b/include/utils.h index bf6dea23df66..1630dd0b2854 100644 --- a/include/utils.h +++ b/include/utils.h @@ -157,9 +157,7 @@ int get_u64(__u64 *val, const char *arg, int base); int get_u32(__u32 *val, const char *arg, int base); int get_s32(__s32 *val, const char *arg, int base); int get_u16(__u16 *val, const char *arg, int base); -int get_s16(__s16 *val, const char *arg, int base); int get_u8(__u8 *val, const char *arg, int base); -int get_s8(__s8 *val, const char *arg, int base); int get_be64(__be64 *val, const char *arg, int base); int get_be32(__be32 *val, const char *arg, int base); int get_be16(__be16 *val, const char *arg, int base); @@ -172,7 +170,6 @@ __u8 *hexstring_a2n(const char *str, __u8 *buf, int blen, unsigned int *len); int addr64_n2a(__u64 addr, char *buff, size_t len); int af_bit_len(int af); -int af_byte_len(int af); const char *format_host_r(int af, int len, const void *addr, char *buf, int buflen); @@ -326,8 +323,6 @@ void drop_cap(void); int get_time(unsigned int *time, const char *str); int get_time64(__s64 *time, const char *str); -void print_time(char *buf, int len, __u32 time); -void print_time64(char *buf, int len, __s64 time); char *sprint_time(__u32 time, char *buf); char *sprint_time64(__s64 time, char *buf); diff --git a/lib/utils.c b/lib/utils.c index 345630d04929..4965a5750880 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -45,6 +45,10 @@ int timestamp_short; int pretty; const char *_SL_ = "\n"; +static int af_byte_len(int af); +static void print_time(char *buf, int len, __u32 time); +static void print_time64(char *buf, int len, __s64 time); + int read_prop(const char *dev, char *prop, long *value) { char fname[128], buf[80], *endp, *nl; @@ -426,43 +430,6 @@ int get_s32(__s32 *val, const char *arg, int base) return 0; } -int get_s16(__s16 *val, const char *arg, int base) -{ - long res; - char *ptr; - - if (!arg || !*arg) - return -1; - res = strtol(arg, &ptr, base); - if (!ptr || ptr == arg || *ptr) - return -1; - if ((res == LONG_MIN || res == LONG_MAX) && errno == ERANGE) - return -1; - if (res > 0x7FFF || res < -0x8000) - return -1; - - *val = res; - return 0; -} - -int get_s8(__s8 *val, const char *arg, int base) -{ - long res; - char *ptr; - - if (!arg || !*arg) - return -1; - res = strtol(arg, &ptr, base); - if (!ptr || ptr == arg || *ptr) - return -1; - if ((res == LONG_MIN || res == LONG_MAX) && errno == ERANGE) - return -1; - if (res > 0x7F || res < -0x80) - return -1; - *val = res; - return 0; -} - int get_be64(__be64 *val, const char *arg, int base) { __u64 v; @@ -708,7 +675,7 @@ int af_bit_len(int af) return 0; } -int af_byte_len(int af) +static int af_byte_len(int af) { return af_bit_len(af) / 8; } @@ -1710,8 +1677,7 @@ int get_time(unsigned int *time, const char *str) return 0; } - -void print_time(char *buf, int len, __u32 time) +static void print_time(char *buf, int len, __u32 time) { double tmp = time; @@ -1764,7 +1730,7 @@ int get_time64(__s64 *time, const char *str) return 0; } -void print_time64(char *buf, int len, __s64 time) +static void print_time64(char *buf, int len, __s64 time) { double nsec = time; From patchwork Thu Nov 15 22:36:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998593 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="MzGckRwP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx881rdJz9s3x for ; Fri, 16 Nov 2018 09:37:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729077AbeKPIqb (ORCPT ); Fri, 16 Nov 2018 03:46:31 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42393 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727195AbeKPIqa (ORCPT ); Fri, 16 Nov 2018 03:46:30 -0500 Received: by mail-pf1-f193.google.com with SMTP id 64so5904836pfr.9 for ; Thu, 15 Nov 2018 14:36:47 -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=CEgC+dPrx9LLBKMzgxo4R3HFpwKbk8wRx6tqEjbp3no=; b=MzGckRwPGnmV3PrUTi1T9CW4+5FbBiOqEkOPEEc3VufZQ+dlO6RsJ7/me4+46SKBdC McUdsLlqohvLfzz32ZKobcUcQqSI6860+Yts3R9REA5Fx33WRhm2dkGCh/fZQRvI7Y+3 sX6jH0UMnIQB6L3dY/7mFrx4wHTlbSjf3T4ApAwtEuh+I1joo9YEZ+wLRsqp+zABcg2w qiE9d7WesAqFwoTQY1Q4VCCcuNzd1kQCKpcAOx0LZQ7RYKGue7jP69IDUemB8N6Urzlg 0OVjvxZew1gLNRonG4T0l3cGoVT0NnqkO7xRlrV6+aGoASbNA4yiI1yhfI3ClbMyzG/+ 4PZw== 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=CEgC+dPrx9LLBKMzgxo4R3HFpwKbk8wRx6tqEjbp3no=; b=nyqtC0+QtmzmfqzStdrGQpr26b4pzAiQhEWGRBDbzN5z6eelqeAcq1QPp+ELFVqBI+ CAVsvulzj+AilAmcAwc2mBv38vpOE+zXDBmcRi84FdaelvHXsacbJnKMZ0GRdm8u+eAV fkmMdrdKoOMIpwbk96yF0GlDDDCEYkCEv3kD6a7VnGsGjt2HO8lprpRaE4+NyCNBphaT h9rzsPDtRDNopJU2IIUma0vHmt20826NTxm4lfMv59PY29uJnwVF+q1QxJRb7cXt10Z/ nUb3Zh4u0wE34UvctNvK5BqBX6sIHvxC6NSzHxe203gzaTPlgPj2zho7O1fEYA68D8bM eauw== X-Gm-Message-State: AGRZ1gIxEAHiuNzHBqkqguvy2BC3gmWvrXZxU4hY+Lm+FAdO+RM0xC4/ O2yZX5q70NdLzSUfioPknyO2NcJ5p7FWJw== X-Google-Smtp-Source: AJdET5fEQhYRpur+4ghGQmk9SONR1e2HhyHtxtBWJGcqheCytllJb73044xyzLRdJIhKhrc6MBssSg== X-Received: by 2002:a65:6447:: with SMTP id s7mr7534809pgv.226.1542321406078; Thu, 15 Nov 2018 14:36:46 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:45 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 03/22] lib/color: make local functions static Date: Thu, 15 Nov 2018 14:36:21 -0800 Message-Id: <20181115223640.411-4-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 color_enable etc, only used here. Signed-off-by: Stephen Hemminger --- include/color.h | 2 -- lib/color.c | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/color.h b/include/color.h index e30f28c51c84..17ec56f3d7b4 100644 --- a/include/color.h +++ b/include/color.h @@ -20,10 +20,8 @@ enum color_opt { COLOR_OPT_ALWAYS = 2 }; -void enable_color(void); bool check_enable_color(int color, int json); bool matches_color(const char *arg, int *val); -void set_color_palette(void); int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...); enum color_attr ifa_family_color(__u8 ifa_family); enum color_attr oper_state_color(__u8 state); diff --git a/lib/color.c b/lib/color.c index e5406294dfc4..59976847295c 100644 --- a/lib/color.c +++ b/lib/color.c @@ -11,6 +11,8 @@ #include "color.h" #include "utils.h" +static void set_color_palette(void); + enum color { C_RED, C_GREEN, @@ -73,7 +75,7 @@ static enum color attr_colors_dark[] = { static int is_dark_bg; static int color_is_enabled; -void enable_color(void) +static void enable_color(void) { color_is_enabled = 1; set_color_palette(); @@ -117,7 +119,7 @@ bool matches_color(const char *arg, int *val) return true; } -void set_color_palette(void) +static void set_color_palette(void) { char *p = getenv("COLORFGBG"); From patchwork Thu Nov 15 22:36:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998594 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="hYnxXo8g"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx886v9Vz9s47 for ; Fri, 16 Nov 2018 09:37:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389158AbeKPIr1 (ORCPT ); Fri, 16 Nov 2018 03:47:27 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:45501 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727244AbeKPIqb (ORCPT ); Fri, 16 Nov 2018 03:46:31 -0500 Received: by mail-pg1-f196.google.com with SMTP id y4so9641438pgc.12 for ; Thu, 15 Nov 2018 14:36:47 -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=mpM6uGbwYxtOvUnkwdQShbOj0uLQV4e+qByI6eMVRd0=; b=hYnxXo8gZdgNs7atpqQkxBC+JVxyNljGnh0O2ellMzRByc5Z8V4Lb6BCiCtiIhnYrA TTyCqIivIN69pUGeweelNi8ZGS2gjDbJbVjRuCDXVX3bg5kDyvNRUydX4jejlugOUmFR +2WUpta8dr1nUW8us7aQyKrgSzGTtNVz5yLBYQmIxecASnF+fI/1X0BRvjNe79odQHqA my2Vry7wzSdIa2yBLmJR+BjnWeBQgdShODG80IbDPPJdqBpW0sZHAWHIQeKPgq3/ISkj Cz9kSWQa6bqjLTX12oy5IlGZ+IWrfSzWs1otSVRweDEVzJJIFQZZs1votxJaaa2mE2du ZRlg== 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=mpM6uGbwYxtOvUnkwdQShbOj0uLQV4e+qByI6eMVRd0=; b=fxEy2U8N/raEOGJxEGziAf9M0uGMP6lDmLniZn0wiK+8kCFxPbRspfBXn4Yi9Qj9hh iK7o5q5SbFKGIXA9FzBNWvPJi4EYiPCav6J5E+eKcrgrBR+RV/fPwP6KoQ8aNRR4olPT 8HAYDSFR89sC4HND2P7cFcu4HnQ8lNO6I/vBgZvwxygsI5U1XLa3C+3LrlcKVw06J5sa j5SzL6iKzh4Y130nbUu4uVPz2dI96wxMdX2AeEf+czA3LdW+tbREm2lVxooiG+GprW/d ZfU+JLWHd3J3nhg9RvpboQnvBdwcGcr3F0F9/ImfEooHkhOiSpzGz8jAl0DtKPqUwXSt 4MBw== X-Gm-Message-State: AGRZ1gLQE0T8xxRGPCVW8jQpz74cDmceuv+c6oFWv+H8ko28H+BYVnG2 D9ywHlvDq2XLyOwznSAK4y9oiDQMSt3MUA== X-Google-Smtp-Source: AJdET5eUMcOWze2lHzm2p3G+9LM2HPPYYw88Gh0BhCpuPcg79e0VtGEsJ4946Oald00KrEAqmim70A== X-Received: by 2002:a62:4d82:: with SMTP id a124-v6mr6791112pfb.113.1542321406871; Thu, 15 Nov 2018 14:36:46 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:46 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 04/22] lib/ll_map: make local function static Date: Thu, 15 Nov 2018 14:36:22 -0800 Message-Id: <20181115223640.411-5-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 ll_idx_a2n is only used in ll_map. Signed-off-by: Stephen Hemminger --- include/ll_map.h | 1 - lib/ll_map.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/ll_map.h b/include/ll_map.h index fb708191c22c..511fe00b8567 100644 --- a/include/ll_map.h +++ b/include/ll_map.h @@ -12,6 +12,5 @@ int ll_index_to_flags(unsigned idx); unsigned namehash(const char *str); const char *ll_idx_n2a(unsigned int idx); -unsigned int ll_idx_a2n(const char *name); #endif /* __LL_MAP_H__ */ diff --git a/lib/ll_map.c b/lib/ll_map.c index 1b4095a7d873..1ab8ef0758ac 100644 --- a/lib/ll_map.c +++ b/lib/ll_map.c @@ -143,7 +143,7 @@ const char *ll_idx_n2a(unsigned int idx) return buf; } -unsigned int ll_idx_a2n(const char *name) +static unsigned int ll_idx_a2n(const char *name) { unsigned int idx; From patchwork Thu Nov 15 22:36:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998575 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="bRM5YYWf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx765wrmz9s3q for ; Fri, 16 Nov 2018 09:36:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388764AbeKPIqc (ORCPT ); Fri, 16 Nov 2018 03:46:32 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:35624 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727195AbeKPIqc (ORCPT ); Fri, 16 Nov 2018 03:46:32 -0500 Received: by mail-pf1-f195.google.com with SMTP id v9-v6so10381914pff.2 for ; Thu, 15 Nov 2018 14:36:48 -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=Gonkt1Fa/kpY5exxgctONAzmd8G4uljHb//1lqwyJXk=; b=bRM5YYWfL+Sp94Fpw3gNpFNOzNbEzRGYfBTwvM6D/aEd3NQn3A6qhnCRoD3TSBZE7V FiF/Aye0dT9aOmZzoTxaR0OZwY+PSQKzIJ/ktVnc/t9Qe1rLHV0LyoU6TOtIZI7jNTws GhTAujVnuKrmE2NsOMmoM4mXkh/P+DO/eMpArzNiNsvOL/TWBx+v30klTLMvokwnxNXw k8slOR89X4tXnD8JmdMxueMGyoqsEIf8Zm4Xz61FwnkK4z4M3XnayYMiGux5jUJspi1y XpfrWqDmAtFUkzGbPCuOOkxsY0lN1SNZdGwmbRmK4m0ATs3qQiZl4cfzu2ymR2/6h0/2 K+vA== 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=Gonkt1Fa/kpY5exxgctONAzmd8G4uljHb//1lqwyJXk=; b=X9fKR1CCnSVTPMb51MOyqaeCT++9M5AubrBo4BU8M70jZfTR+1lAF32abBrdlskLcX H/RHCkqKY3kJ4pWPJ1VMqADFq7SGMLuVZGJrNeB08n2v2L6DUfWmpSo4E4RHqBiu5YeN b7zDh/tGpBGoGcXA3dMMaSfQBgoFbAhtq2fIQzLWwUKMgmSj9rAhz+4CI1V5phLcbIdC uQlMeQZvAsBykj8vkwaUd4NBCKYR+pbevSK0NVnJlF/dqwgOxrj/BYvkRMNPkfPbs+wl NJuP3x3GKwLJUrggczwdanqpAPHVokNC6/8vOtZa/rMDtFRRhkQWsPwn3M2xfCKoceCg y8iA== X-Gm-Message-State: AGRZ1gLV4kvxThsy3s5NE/vzYZn9LkbwlKGpXdZwqxZ4t3KZvD7rhw2R PyBBN1GLepuUTQ9GEhH9PIBOb991OFrcjQ== X-Google-Smtp-Source: AJdET5dtH7Q8RE+hc80TQ/jgbfKOeu/wfRgfzAWmX5+GL1R3eUV8o+j6ZQtHePkYdUIz2pNPXhUSWw== X-Received: by 2002:a63:194f:: with SMTP id 15mr7644441pgz.192.1542321407654; Thu, 15 Nov 2018 14:36:47 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:47 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 05/22] libnetlnk: unused and local functions cleanup Date: Thu, 15 Nov 2018 14:36:23 -0800 Message-Id: <20181115223640.411-6-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 rntl_talk_extack and parse_rtattr_index not used in current code. rtnl_dump_filter_l is only used in this file. Signed-off-by: Stephen Hemminger --- include/libnetlink.h | 7 ------- lib/libnetlink.c | 28 ++-------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/include/libnetlink.h b/include/libnetlink.h index fa8de093d484..138840d5c892 100644 --- a/include/libnetlink.h +++ b/include/libnetlink.h @@ -102,8 +102,6 @@ struct rtnl_dump_filter_arg { __u16 nc_flags; }; -int rtnl_dump_filter_l(struct rtnl_handle *rth, - const struct rtnl_dump_filter_arg *arg); int rtnl_dump_filter_nc(struct rtnl_handle *rth, rtnl_filter_t filter, void *arg, __u16 nc_flags); @@ -115,9 +113,6 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, int rtnl_talk_iov(struct rtnl_handle *rtnl, struct iovec *iovec, size_t iovlen, struct nlmsghdr **answer) __attribute__((warn_unused_result)); -int rtnl_talk_extack(struct rtnl_handle *rtnl, struct nlmsghdr *n, - struct nlmsghdr **answer, nl_ext_ack_fn_t errfn) - __attribute__((warn_unused_result)); int rtnl_talk_suppress_rtnl_errmsg(struct rtnl_handle *rtnl, struct nlmsghdr *n, struct nlmsghdr **answer) __attribute__((warn_unused_result)); @@ -152,8 +147,6 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type, int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len); int parse_rtattr_flags(struct rtattr *tb[], int max, struct rtattr *rta, int len, unsigned short flags); -int parse_rtattr_byindex(struct rtattr *tb[], int max, - struct rtattr *rta, int len); struct rtattr *parse_rtattr_one(int type, struct rtattr *rta, int len); int __parse_rtattr_nested_compat(struct rtattr *tb[], int max, struct rtattr *rta, int len); diff --git a/lib/libnetlink.c b/lib/libnetlink.c index fe4a7a4b9c71..c0b80ed6fdfb 100644 --- a/lib/libnetlink.c +++ b/lib/libnetlink.c @@ -611,8 +611,8 @@ static int rtnl_recvmsg(int fd, struct msghdr *msg, char **answer) return len; } -int rtnl_dump_filter_l(struct rtnl_handle *rth, - const struct rtnl_dump_filter_arg *arg) +static int rtnl_dump_filter_l(struct rtnl_handle *rth, + const struct rtnl_dump_filter_arg *arg) { struct sockaddr_nl nladdr; struct iovec iov; @@ -877,13 +877,6 @@ int rtnl_talk_iov(struct rtnl_handle *rtnl, struct iovec *iovec, size_t iovlen, return __rtnl_talk_iov(rtnl, iovec, iovlen, answer, true, NULL); } -int rtnl_talk_extack(struct rtnl_handle *rtnl, struct nlmsghdr *n, - struct nlmsghdr **answer, - nl_ext_ack_fn_t errfn) -{ - return __rtnl_talk(rtnl, n, answer, true, errfn); -} - int rtnl_talk_suppress_rtnl_errmsg(struct rtnl_handle *rtnl, struct nlmsghdr *n, struct nlmsghdr **answer) { @@ -1242,23 +1235,6 @@ int parse_rtattr_flags(struct rtattr *tb[], int max, struct rtattr *rta, return 0; } -int parse_rtattr_byindex(struct rtattr *tb[], int max, - struct rtattr *rta, int len) -{ - int i = 0; - - memset(tb, 0, sizeof(struct rtattr *) * max); - while (RTA_OK(rta, len)) { - if (rta->rta_type <= max && i < max) - tb[i++] = rta; - rta = RTA_NEXT(rta, len); - } - if (len) - fprintf(stderr, "!!!Deficit %d, rta_len=%d\n", - len, rta->rta_len); - return i; -} - struct rtattr *parse_rtattr_one(int type, struct rtattr *rta, int len) { while (RTA_OK(rta, len)) { From patchwork Thu Nov 15 22:36:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998592 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="G4ebuZvb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx854Tx7z9s3Z for ; Fri, 16 Nov 2018 09:37:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389152AbeKPIrY (ORCPT ); Fri, 16 Nov 2018 03:47:24 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:46740 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbeKPIqc (ORCPT ); Fri, 16 Nov 2018 03:46:32 -0500 Received: by mail-pl1-f196.google.com with SMTP id t13so7178391ply.13 for ; Thu, 15 Nov 2018 14:36:49 -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=T4gg30to4yreSnLfth5iZ0oPJ33TAqmbEt0/VJx4APc=; b=G4ebuZvbTtJIs8QFFi0o4vSRP6AQGH2sO0EWnMofwMkdgRxCzN2QEh+ZdqRVo/XNkJ k5EeVJqXHccawzyQrcc93TzaQP2YFxQVhAcIlWmPIg7lleIwsnyEmvq3HPvsWD3cmj/F 6iShkjaSc3TUdU0u2AxjDEL+HqZv4GXHmIWWRoPi2Qk/rLr1PIF7skz6agTg9FAswr/z myR1Ra8zTFvDNp+6H9y0K2vY4ESz7sPZZ/2BIYGau8VYHmOnwUC5ls0fgNp5T2rFAr3Q mGeplFQxP7SogvLdb8WFweVYo9aZC7iEODxKE4WvqAopOU5rkuSZw1IfNlN+HINntigI eZow== 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=T4gg30to4yreSnLfth5iZ0oPJ33TAqmbEt0/VJx4APc=; b=PDjkl/yh62iXkl6uiBpIH0aEX51D5FI/tAct+9SMQAgIIhPCpcCUozrkUOdWp8Z3wt ertQ9BbFf/AaF6U0qrgdEYzqwXaqQgcOxsEI5mQAPXSKZczgG5rPakl23gRHx8eXSFc2 +EZGIdZFy20Hd4rko9M1yo/9QOxOrs70c8tNd9U2LUJdpvF8OIUWPAywcEOprTS0XMPY svZmmbyd5HL8uPYgCCp84eeVy+iQUuiV6qBZhTAnCUBCuDgEFoZdZcqqWNwkxe7v5wgk ChHIE8Ofen8bzOIX2IJ8IYfyMrf2cvtI8krck+2fAIL0uOhVYvhGXj8forWHLusxZxjK mAag== X-Gm-Message-State: AGRZ1gJIFnFYIsGpBpXgRiTkbiZ/9ujNhtvnz7QDqQZngnCdBq4ot63b fDXZN/KhMDu9T+L2UBJoMzwVqoEdNWXDvA== X-Google-Smtp-Source: AJdET5cRRKKlRGrod28Be66btFH45BLeT1WpQq9VCs/+NxUDU7nb55saphx7j+0R7gBQyzId6JOnXA== X-Received: by 2002:a17:902:598e:: with SMTP id p14mr8096473pli.260.1542321408439; Thu, 15 Nov 2018 14:36:48 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:47 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 06/22] genl: remove dead code Date: Thu, 15 Nov 2018 14:36:24 -0800 Message-Id: <20181115223640.411-7-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 The function genl_ctrl_resolve_family is defined but never used in current code. Signed-off-by: Stephen Hemminger --- genl/ctrl.c | 71 ----------------------------------------------- genl/genl_utils.h | 2 -- 2 files changed, 73 deletions(-) diff --git a/genl/ctrl.c b/genl/ctrl.c index 6133336ab435..0fb464b01cfb 100644 --- a/genl/ctrl.c +++ b/genl/ctrl.c @@ -38,77 +38,6 @@ static int usage(void) return -1; } -int genl_ctrl_resolve_family(const char *family) -{ - struct rtnl_handle rth; - int ret = 0; - struct { - struct nlmsghdr n; - struct genlmsghdr g; - char buf[4096]; - } req = { - .n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN), - .n.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK, - .n.nlmsg_type = GENL_ID_CTRL, - .g.cmd = CTRL_CMD_GETFAMILY, - }; - struct nlmsghdr *nlh = &req.n; - struct genlmsghdr *ghdr = &req.g; - struct nlmsghdr *answer = NULL; - - if (rtnl_open_byproto(&rth, 0, NETLINK_GENERIC) < 0) { - fprintf(stderr, "Cannot open generic netlink socket\n"); - exit(1); - } - - addattr_l(nlh, 128, CTRL_ATTR_FAMILY_NAME, family, strlen(family) + 1); - - if (rtnl_talk(&rth, nlh, &answer) < 0) { - fprintf(stderr, "Error talking to the kernel\n"); - goto errout; - } - - { - struct rtattr *tb[CTRL_ATTR_MAX + 1]; - int len = answer->nlmsg_len; - struct rtattr *attrs; - - if (answer->nlmsg_type != GENL_ID_CTRL) { - fprintf(stderr, "Not a controller message, nlmsg_len=%d " - "nlmsg_type=0x%x\n", answer->nlmsg_len, answer->nlmsg_type); - goto errout; - } - - if (ghdr->cmd != CTRL_CMD_NEWFAMILY) { - fprintf(stderr, "Unknown controller command %d\n", ghdr->cmd); - goto errout; - } - - len -= NLMSG_LENGTH(GENL_HDRLEN); - - if (len < 0) { - fprintf(stderr, "wrong controller message len %d\n", len); - free(answer); - return -1; - } - - attrs = (struct rtattr *) ((char *) answer + NLMSG_LENGTH(GENL_HDRLEN)); - parse_rtattr(tb, CTRL_ATTR_MAX, attrs, len); - - if (tb[CTRL_ATTR_FAMILY_ID] == NULL) { - fprintf(stderr, "Missing family id TLV\n"); - goto errout; - } - - ret = rta_getattr_u16(tb[CTRL_ATTR_FAMILY_ID]); - } - -errout: - free(answer); - rtnl_close(&rth); - return ret; -} - static void print_ctrl_cmd_flags(FILE *fp, __u32 fl) { fprintf(fp, "\n\t\tCapabilities (0x%x):\n ", fl); diff --git a/genl/genl_utils.h b/genl/genl_utils.h index cc1f3fb76596..a8d433a9574f 100644 --- a/genl/genl_utils.h +++ b/genl/genl_utils.h @@ -13,6 +13,4 @@ struct genl_util int (*print_genlopt)(struct nlmsghdr *n, void *arg); }; -int genl_ctrl_resolve_family(const char *family); - #endif From patchwork Thu Nov 15 22:36:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998576 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="Bc4n8vbP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx780DSxz9s3q for ; Fri, 16 Nov 2018 09:36:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388876AbeKPIqe (ORCPT ); Fri, 16 Nov 2018 03:46:34 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:42553 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727195AbeKPIqd (ORCPT ); Fri, 16 Nov 2018 03:46:33 -0500 Received: by mail-pg1-f194.google.com with SMTP id d72so6206764pga.9 for ; Thu, 15 Nov 2018 14:36:50 -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=qnsQ2108Fwi13RI84V2gwK2PYe0UjELmndIak/7fYAE=; b=Bc4n8vbPA7Sc41cuUxL8QpLNf41bkgNZdR+tSHEPpkPsvlto60tncxegjl8+Re33Ln WmEoz8hH4HK2GQEtBidQHjM91oLvT3MmxEpFRaB+lBh4d51207tld6bKgunkffw4h8s0 cY9WwiSXgEooHJj9DTNcfRhg+vtcs3dWO+ilnZ/yCJNIAUfuPVrr3B1+uowXvxdOIHNg fkY8MVSvkSnoVN3aDuy6VH+Z54HpSNrto2qeTxe+zfisQPtLa6qIynA07wCYxuepzeHe 02e9KuudB0uj2dy1BYEGCHDdr4EaS4VjTUWRF4hbuQbDaYXIltBY+6slnlzDjI1wJKX/ +3kA== 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=qnsQ2108Fwi13RI84V2gwK2PYe0UjELmndIak/7fYAE=; b=JRI+zlUKfx5R6HyAuKAe67pvDnjxV4ds6WwlOGZLauUNtzM7aWzVoe3iMD8b2HJUKw hcFJPVSvq1QpqElmnAz5Xpv3OtB/Wd8IMEAkJq+XzF0v/H903b+2GDO0KFA82JLPMLsU 2DSjsx+45nDAnyi4cjrpZ0KRm/gslx9xbs4i4dv3rd1lXrt0AxMa2xlbWb/mstbdjJ1+ 5tT3MAXK97d4oPcRJiJBKxBdN25uJ6mdmgJhTRFgE6YlBIxz09yNGYnfdwriWWtdHx8i h8M2WZNVWadb7s2nLWRnpP7guJQtFKrQkcCDntugv6OlLcUep0TfoDE/UtzUKD8j6MWC VTDw== X-Gm-Message-State: AGRZ1gJM2514XB4kdnPSTHVadUGEfbiHyVL/E/gi/KYcXEgNaMeT22c/ SPwrOWFQ0t39kzhi8QOx5upf+9DFgNRefg== X-Google-Smtp-Source: AJdET5dNqczRi4fzQ/Ny0ppm2GTDW2rKBnd987UD7DEpZ37wlzCfzpynSEHsN5ESETakFAHxmI8KwQ== X-Received: by 2002:a63:ec4b:: with SMTP id r11mr7363483pgj.44.1542321409213; Thu, 15 Nov 2018 14:36:49 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:48 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 07/22] bridge: make local variables static Date: Thu, 15 Nov 2018 14:36:25 -0800 Message-Id: <20181115223640.411-8-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 enable_color and set_color_palette only used here. Signed-off-by: Stephen Hemminger --- bridge/bridge.c | 5 ++--- bridge/monitor.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bridge/bridge.c b/bridge/bridge.c index ac4d6a14f510..389f1bd5382b 100644 --- a/bridge/bridge.c +++ b/bridge/bridge.c @@ -23,12 +23,11 @@ int preferred_family = AF_UNSPEC; int oneline; int show_stats; int show_details; -int show_pretty; -int color; +static int color; int compress_vlans; int json; int timestamp; -char *batch_file; +static const char *batch_file; int force; static void usage(void) __attribute__((noreturn)); diff --git a/bridge/monitor.c b/bridge/monitor.c index 82bc6b407a06..708a1bd2ccb0 100644 --- a/bridge/monitor.c +++ b/bridge/monitor.c @@ -27,7 +27,7 @@ static void usage(void) __attribute__((noreturn)); -int prefix_banner; +static int prefix_banner; static void usage(void) { From patchwork Thu Nov 15 22:36:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998577 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="Dzi6sB03"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx792Vmzz9s3q for ; Fri, 16 Nov 2018 09:36:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388921AbeKPIqf (ORCPT ); Fri, 16 Nov 2018 03:46:35 -0500 Received: from mail-pf1-f169.google.com ([209.85.210.169]:39579 "EHLO mail-pf1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727195AbeKPIqe (ORCPT ); Fri, 16 Nov 2018 03:46:34 -0500 Received: by mail-pf1-f169.google.com with SMTP id c72so5690767pfc.6 for ; Thu, 15 Nov 2018 14:36:50 -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=OV2HBMkglE+YBkS55z5UmcsAOuNjXloupWe28bKswoA=; b=Dzi6sB03Yge0USAAoIWVET2oacoyJzvZb1ZztIHTckOkelGI/iKScBtWYb5Hcwzxbs eCKsfG1dpjnxwTAWECPu+l93Ai6vHXR/AWxSEZXvw4hhDbGQbxRd5WOIJImAMJOuxvyK LnpClhUK3jfBAzNAPmwFrcBHNa2NYcaOCu5nbG92JbPoHZXLN0vVj8AYudnjK4LxIZEo QBW6BN3sDsUsyitJR6qT9XMyTT2jfZxmUkTUlBrkFLjkCkquRZSmAiizVQdtlsKzAeC3 IZjsmDeTc9aFGn6CzSz/yd3PmOnKnDyEgCGhlhp/E0m61shkeiz2bck72ZfdRnK1xBKY BpPA== 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=OV2HBMkglE+YBkS55z5UmcsAOuNjXloupWe28bKswoA=; b=lHtiFaHvZohdTNu8CoctFWkAOxyhXN/whI0y/oS1mE4v5WLTEdU1IKEq0jKPVhhXDf DrrQyd7jSa7RL+SdJSUP/6wo3cbXCkVfFjeyLR5bxfagTSSwrRs58hW9Bgo9xbG9t1kC 58j2aPj9rGJskwUdg0QTEHbJqcFkvtnBkCLGRnZC3dyPbmsugkaixw5CFDuyf5yCE/0R 0tYYvReW6sYm6SXc0I9SC+vpajE7w3FRgEsnJ/2bftxJ0P0WqbFtHLwPcmV5fymi4pLS ZwBO+Z1KshaCA8QwDhxM1W3XDtkStJNfj0mlfXYk/s2Eejw+F71UuTLnUY41bDV7pRqh svmg== X-Gm-Message-State: AGRZ1gLCLalHDjA6ijPD5t89AqL6sret51Sjx565AFzg/aCV/R6SwSAi 7wOdbmtpXVVEhMCIFRd4jumLQJN6FcCGpw== X-Google-Smtp-Source: AJdET5fBOgaVRHsAYSBC1xRtTa1K52Dt0GBE3dsv/rxnU4K8+2vFLLa29bbaxie6KXFQJIbswN0vtQ== X-Received: by 2002:a63:5518:: with SMTP id j24mr1884832pgb.208.1542321410064; Thu, 15 Nov 2018 14:36:50 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:49 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 08/22] ip: make flag names const/static Date: Thu, 15 Nov 2018 14:36:26 -0800 Message-Id: <20181115223640.411-9-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 The table of filter flags is only used in ipaddress Signed-off-by: Stephen Hemminger --- ip/ipaddress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip/ipaddress.c b/ip/ipaddress.c index cd8cc76a3473..2671c4e162e3 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -1149,7 +1149,7 @@ static unsigned int get_ifa_flags(struct ifaddrmsg *ifa, } /* Mapping from argument to address flag mask */ -struct { +static const struct { const char *name; unsigned long value; } ifa_flag_names[] = { From patchwork Thu Nov 15 22:36:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998591 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="WtKAgB3x"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx820XCXz9s3Z for ; Fri, 16 Nov 2018 09:37:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389148AbeKPIrU (ORCPT ); Fri, 16 Nov 2018 03:47:20 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:45503 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727792AbeKPIqf (ORCPT ); Fri, 16 Nov 2018 03:46:35 -0500 Received: by mail-pg1-f193.google.com with SMTP id y4so9641499pgc.12 for ; Thu, 15 Nov 2018 14:36:51 -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=nLiXgu8Zvwp5cuioNzpqdR8vI1eMbgL04niiGXQk2ZU=; b=WtKAgB3xNkwWGNLXceb27y5mfuoAN96kLwcH4A7qXQBKMC85rYLv28CNCbAraWxHLD 2BmH9zp4yAQ+BBDw0kDE625zJlBwwzBoUyV642aEOP6syGx+3OBwdBiEofaQQuAW7d7k 7XqdNTFHprlxY95tI+87vAxqFrAMcme4K0829zzKKnh7rojp7VO050Y1lQ63QN+KeGO2 gW05m9fWfUsvfRGpvBvcKrGW1d5SP5PV/PygmTsPrAvvmIbNZUShHyYLmaq4Oz3J43gt SMO+xyV8YiU3MdFbRKZX4wO8z2R7a8c2G5+i0amXQVe13+lFhVBlB8Lkc50SBZhxJeZo vAhw== 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=nLiXgu8Zvwp5cuioNzpqdR8vI1eMbgL04niiGXQk2ZU=; b=qLA1afWBJbYmFIDH71CoaXL6vpnIxCk5MN8cI6D3UYwIOdWIRNy/FmgaQxDS1fTqiR EVHDJnxdh81wz7csJ1XhwpZp2+gWEsh5xBZnKyw48rOUzaHfbEhLVXkC4TtTx/wVgkhs ZVXuEWVVJ3O5ERxU5NkAXh4M8zj+anW8UfS8cuDPDf5QtfuIU7gp0TaRE08VsLZODn9R jg/q3NsQHiFkX9OozK4gvZGlSpWmaxrSMCcQNh8T7niVElLWeOnPNRBQxXYzITDkNsSq XT9iEwuRsd/pt06xBl55IiezN9scDfHVPt1oWE66iobpQw797j3FijneL0G+id3JDeFz U2RA== X-Gm-Message-State: AGRZ1gJ/uXQz0rGZa0KoQ92YbDuW03YQwudvHbNcvOCuUo+py4d5Sek/ QB8165LJqkQTz1AmG36UWnBD1+E21vrz/g== X-Google-Smtp-Source: AJdET5dV7HLqpCrLTtmfe3lnGbuWUu7aZy5q7aZfT4Nq08QNXjuTnb1K3hgpCKj7EECdvSZyGOjOgg== X-Received: by 2002:a62:8383:: with SMTP id h125mr1410694pfe.187.1542321410869; Thu, 15 Nov 2018 14:36:50 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:50 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 09/22] ipmonitor: make local variable static Date: Thu, 15 Nov 2018 14:36:27 -0800 Message-Id: <20181115223640.411-10-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 prefix_banner only used in one file. Signed-off-by: Stephen Hemminger --- ip/ipmonitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c index 9d5ac2b5e4d2..743632cc5569 100644 --- a/ip/ipmonitor.c +++ b/ip/ipmonitor.c @@ -24,7 +24,7 @@ #include "ip_common.h" static void usage(void) __attribute__((noreturn)); -int prefix_banner; +static int prefix_banner; int listen_all_nsid; static void usage(void) From patchwork Thu Nov 15 22:36:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998590 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="N5aCa4B+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7z2DBtz9s3q for ; Fri, 16 Nov 2018 09:37:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388943AbeKPIqg (ORCPT ); Fri, 16 Nov 2018 03:46:36 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:39520 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727195AbeKPIqg (ORCPT ); Fri, 16 Nov 2018 03:46:36 -0500 Received: by mail-pf1-f193.google.com with SMTP id c72so5690801pfc.6 for ; Thu, 15 Nov 2018 14:36:52 -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=tF5gM79+RALTk5dbopqiz44uI/17Mdvw56EwR/mYBO0=; b=N5aCa4B+K1PRDxvdskb5seeqSa91aCL+4Kb4D2RtHtXHEh21bc8VrLxluHYRMOantl LMUJUinNV06JAXGq6zTI+tF8Y0AfD6Xg/cwGSso+lDNaEBcxKMW8QoGr2WO2E9LvsY1l RkXsCwYp1VhGSG992ydPiQkQr+aweudy0u0zM3vghl50hd+5uK+TpP2s71ebTvjTqGxR I7QLs+IsuAGrcIFCYLnH0HLCSK0tcWtIrsFvxl8GX3r5W7wBMmyRvp2CbYn8NhuRJU3U Iw7/cQs+uLH0/OWSWsKQDsMn3BvaAsO5H+BFEUqXbrvDtz/Zgu3AG6c5WmGg/2DIPqHn JLVA== 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=tF5gM79+RALTk5dbopqiz44uI/17Mdvw56EwR/mYBO0=; b=oNnMV26U+lCY7ayYs/E3EQ+FZc9stx2kWevXbxi1SVbN52/KqOKqslXJLDWBWX1Bm4 d+Z1CwYsSp8CyrF1ihBT9O0o7skPBD/hA2Hja2ioWvfQVlW3u1dQH8Cdgo2EGCU0iWmo x6ZDkHZgs4VQL/gHBB5HQQ5feOxv9+FxZed+bJQ0Ct+PAVb/NnkOaWoc9pI0XYeRTAV1 17GIoZOsAPTs36V7bkV1jmw9DlKdc0L2frink8Rcv0KSimabSKRS8lBg0FIKWZKnitIL BpfmZFemspfem3k6/V4MUCUgM7yuF8fPytzzqVIlFnV/m58yKW0DyBiXPoR6HBl2/wNk +EmA== X-Gm-Message-State: AGRZ1gI9ZPVlVsneE5lcjgWCeWwXOHcMNdi/KwTc1Q+Jy5KP+O2z6YxF TJNBwFSbZFNOLkVBBhFn6Y83krFZ2poPsA== X-Google-Smtp-Source: AJdET5cFNCVqnqJBuzmDMLTY89ra0eXXGHPrH3khsTbapGqCq1x/Jqzkg06gXpChpamBmP9EgEXtdQ== X-Received: by 2002:a62:cd89:: with SMTP id o131mr8393200pfg.222.1542321411661; Thu, 15 Nov 2018 14:36:51 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:50 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 10/22] ipxfrm: make local functions static Date: Thu, 15 Nov 2018 14:36:28 -0800 Message-Id: <20181115223640.411-11-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 Make functions only used in ipxfrm.c static. Signed-off-by: Stephen Hemminger --- ip/ipxfrm.c | 11 ++++++----- ip/xfrm.h | 9 --------- ip/xfrm_monitor.c | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c index 17ab4abef4be..2dea4e37f209 100644 --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c @@ -186,7 +186,7 @@ const char *strxf_algotype(int type) return str; } -const char *strxf_mask8(__u8 mask) +static const char *strxf_mask8(__u8 mask) { static char str[16]; const int sn = sizeof(mask) * 8 - 1; @@ -209,7 +209,7 @@ const char *strxf_mask32(__u32 mask) return str; } -const char *strxf_share(__u8 share) +static const char *strxf_share(__u8 share) { static char str[32]; @@ -270,7 +270,7 @@ const char *strxf_ptype(__u8 ptype) return str; } -void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id, +static void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id, __u8 mode, __u32 reqid, __u16 family, int force_spi, FILE *fp, const char *prefix, const char *title) { @@ -337,7 +337,8 @@ static const char *strxf_limit(__u64 limit) return str; } -void xfrm_stats_print(struct xfrm_stats *s, FILE *fp, const char *prefix) +static void xfrm_stats_print(struct xfrm_stats *s, FILE *fp, + const char *prefix) { if (prefix) fputs(prefix, fp); @@ -371,7 +372,7 @@ static const char *strxf_time(__u64 time) return str; } -void xfrm_lifetime_print(struct xfrm_lifetime_cfg *cfg, +static void xfrm_lifetime_print(struct xfrm_lifetime_cfg *cfg, struct xfrm_lifetime_cur *cur, FILE *fp, const char *prefix) { diff --git a/ip/xfrm.h b/ip/xfrm.h index 3b158ad71c13..72390d79cfb5 100644 --- a/ip/xfrm.h +++ b/ip/xfrm.h @@ -118,18 +118,9 @@ int xfrm_algotype_getbyname(char *name); int xfrm_parse_mark(struct xfrm_mark *mark, int *argcp, char ***argvp); const char *strxf_xfrmproto(__u8 proto); const char *strxf_algotype(int type); -const char *strxf_mask8(__u8 mask); const char *strxf_mask32(__u32 mask); -const char *strxf_share(__u8 share); const char *strxf_proto(__u8 proto); const char *strxf_ptype(__u8 ptype); -void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id, - __u8 mode, __u32 reqid, __u16 family, int force_spi, - FILE *fp, const char *prefix, const char *title); -void xfrm_stats_print(struct xfrm_stats *s, FILE *fp, const char *prefix); -void xfrm_lifetime_print(struct xfrm_lifetime_cfg *cfg, - struct xfrm_lifetime_cur *cur, - FILE *fp, const char *prefix); void xfrm_selector_print(struct xfrm_selector *sel, __u16 family, FILE *fp, const char *prefix); void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c index eb07af17cadf..76905ed3f1e1 100644 --- a/ip/xfrm_monitor.c +++ b/ip/xfrm_monitor.c @@ -34,7 +34,7 @@ #include "ip_common.h" static void usage(void) __attribute__((noreturn)); -int listen_all_nsid; +static int listen_all_nsid; static void usage(void) { From patchwork Thu Nov 15 22:36:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998578 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="LPBJKGHb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7F10ptz9s9G for ; Fri, 16 Nov 2018 09:36:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388998AbeKPIqh (ORCPT ); Fri, 16 Nov 2018 03:46:37 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:35630 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388882AbeKPIqh (ORCPT ); Fri, 16 Nov 2018 03:46:37 -0500 Received: by mail-pf1-f196.google.com with SMTP id v9-v6so10382000pff.2 for ; Thu, 15 Nov 2018 14:36:53 -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=v6UG+dq3vJYzwskAWHzMlSWn6nPQz+2jvqa4MBNqse8=; b=LPBJKGHb838LCa5SkAInFq48JP9jyWkpmebunEar5qzCQiAzWUCN5Hu8lLSAmhmCZO hP/a8lg2Kqwf/6aXxtH5vG3dSkiAt3CSxqTIbL0FEU/dbJ0yNmTgRQ6rQV6PaYZJEQD4 T2TpzgWaneBeJUf3X7la4stDmG4e/74cy0KFw0TYqgPHlXBpbeBC7adlUHMqTQ8sacaq zjOifm5/n4PZZDXNG8QiA2INwoke3W/Ke4zQJ01sAu0LjBNfPBCDxYU4vAKpGtwuQnke 6wpoQYYa/dQB3txMqXD+o7Y/KsR5AdkHRrRN6UGAJsFIBTRc4Ab3+Cu4k/0Wnkv7BGh/ xDFg== 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=v6UG+dq3vJYzwskAWHzMlSWn6nPQz+2jvqa4MBNqse8=; b=osYddAmGf0wPvcPKdHTwo07WTOAGY1EVHS1f+maI4OtyavB4a9HwQwNJysVEby7o1W FnK9L2I1gL9KSSu995ELgInSY00SBenrAyoCVlSv9n68ETgaal0hBNLd1o4ETosTvO+2 mB1S7NzCPGJch5+8AsDgv5q9ZC64MbztrMLJDNQA6Vty1EemQi/7SM1ue10cTWk6Kfyo rl3WMtzQiw5yJ9IfGWx6zJ/mraReO+4yP7W9KnoSaqeKPdgNKVKguP/+TGac84WJY9W1 06KxRshpEAXqYcUapoQefr9fAcLkcGcIvh7FRQCoAGFFEv22fFSqjOctFzgkFv4/oXWT Gu0g== X-Gm-Message-State: AGRZ1gIBstxN5nOWy9pTJ9IIp5uZnUHyR7hOGZcshJKEwMXkaENMn2fw tFK9bqsDNrR3yCot7NtZcibFmkGVW+6yXg== X-Google-Smtp-Source: AJdET5e47yhfnc20BhU9EQC6wzIl8GQ8WWGleb9EZ3tZwLLe0ya5eSzvpO5B12zs3t9fvhvL1ox5Og== X-Received: by 2002:a63:a84a:: with SMTP id i10mr7653913pgp.263.1542321412467; Thu, 15 Nov 2018 14:36:52 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:51 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 11/22] tc: drop unused name_to_id function Date: Thu, 15 Nov 2018 14:36:29 -0800 Message-Id: <20181115223640.411-12-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 Not used in current code. Signed-off-by: Stephen Hemminger --- include/names.h | 1 - lib/names.c | 28 ---------------------------- 2 files changed, 29 deletions(-) diff --git a/include/names.h b/include/names.h index 3e5d3b146a23..2fcaacc398d4 100644 --- a/include/names.h +++ b/include/names.h @@ -22,6 +22,5 @@ int db_names_load(struct db_names *db, const char *path); void db_names_free(struct db_names *db); char *id_to_name(struct db_names *db, int id, char *name); -int name_to_id(struct db_names *db, int *id, const char *name); #endif diff --git a/lib/names.c b/lib/names.c index fbd6503f22d4..b46ea7910946 100644 --- a/lib/names.c +++ b/lib/names.c @@ -150,31 +150,3 @@ char *id_to_name(struct db_names *db, int id, char *name) snprintf(name, IDNAME_MAX, "%d", id); return NULL; } - -int name_to_id(struct db_names *db, int *id, const char *name) -{ - struct db_entry *entry; - int i; - - if (!db) - return -1; - - if (db->cached && strcmp(db->cached->name, name) == 0) { - *id = db->cached->id; - return 0; - } - - for (i = 0; i < db->size; i++) { - entry = db->hash[i]; - while (entry && strcmp(entry->name, name)) - entry = entry->next; - - if (entry) { - db->cached = entry; - *id = entry->id; - return 0; - } - } - - return -1; -} From patchwork Thu Nov 15 22:36:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998579 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="xyFs2M/x"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7F647Sz9s9h for ; Fri, 16 Nov 2018 09:36:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389015AbeKPIqi (ORCPT ); Fri, 16 Nov 2018 03:46:38 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38137 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388882AbeKPIqh (ORCPT ); Fri, 16 Nov 2018 03:46:37 -0500 Received: by mail-pg1-f196.google.com with SMTP id f8-v6so9648525pgq.5 for ; Thu, 15 Nov 2018 14:36:54 -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=sW7tvLjbVCfvhiq1mr/Pc/039gAmbJ3VeHRHYMS9nYc=; b=xyFs2M/xfgD0KgGEwuEop/zK8zM2rscPlrM2NRtjWd84Nd57u9raXbJY39rS0BYyWt ekQQgvUEbE8q+HKSziAyH6j+NincyETXJBX+ndePrZtMZm08izEB0dpsLrqP5goIwOO9 tG1G5AmF3GNkAfV0CynsAMGor4LFvBjV3WsUEmiSC4+QDRpMKUAMGj2cArvhrgzQECIi DJNYWeNzJLcKAvGJChU/iIHvoEQunnrk3aOsCMMbvBKHlUN527FgsNVtKoSc3F6FMWQX Tqv+ddEMqosgbsPEKxAczkAnargI14f0evBi1yi05k4SkqjE+I6qPDfP9kBHMF+1jLpp kBQg== 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=sW7tvLjbVCfvhiq1mr/Pc/039gAmbJ3VeHRHYMS9nYc=; b=WOnSWtwkapEYckcPDdAVI4FttAwC23V0GBBGzIjuzF3+Mm6895B+xMUKskQbhdRSr+ lQtZjXRu/YJpj0MYRGg7AHTt+BPbAr0bGTeZz/gQrohKzUoGfrml5A6U/qrmZmPGU684 zC1VxSeyQIJgr9vpo+Ip1UURggW0wP9KSc+bFTJc328kVBMa/WgMU2SVeOyogP7HTVq8 yXxFGsJADWM0SrTuAcgFZ9STYcvup2dPcLJMJYf21UwY8MWwoZAlh8Q+fDjbFUBQFD03 mQPgGK3GF8SCATuBBUP7emKbCHkLXy1fznn9VC+L+9ucwxgm6Zhul8eSu37Ow4EEJCfy iTIA== X-Gm-Message-State: AGRZ1gLALIXUpC0ZXXu0Uar35ocpystub8Xfd8mzNuMSXb7Ca4CyXeFZ 7c/MgEuMs5+FcAn9FjIVz5SlFI4zB5IPSA== X-Google-Smtp-Source: AJdET5eIM6iGtvBC5jJRUOju2csLQBQEgBWA6Moe0vaQEB2I1uLVEErFP72PuvTj8sTDVAXCTvHsAw== X-Received: by 2002:a62:42d4:: with SMTP id h81mr8363696pfd.259.1542321413315; Thu, 15 Nov 2018 14:36:53 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:52 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 12/22] tipc: make cmd_find static Date: Thu, 15 Nov 2018 14:36:30 -0800 Message-Id: <20181115223640.411-13-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 Function only used in one file. Signed-off-by: Stephen Hemminger --- tipc/cmdl.c | 2 +- tipc/cmdl.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tipc/cmdl.c b/tipc/cmdl.c index 4a2f4fd92f48..f2f259cc5320 100644 --- a/tipc/cmdl.c +++ b/tipc/cmdl.c @@ -17,7 +17,7 @@ #include "cmdl.h" -const struct cmd *find_cmd(const struct cmd *cmds, char *str) +static const struct cmd *find_cmd(const struct cmd *cmds, char *str) { const struct cmd *c; const struct cmd *match = NULL; diff --git a/tipc/cmdl.h b/tipc/cmdl.h index d37239f85690..03db359956e6 100644 --- a/tipc/cmdl.h +++ b/tipc/cmdl.h @@ -54,6 +54,4 @@ char *shift_cmdl(struct cmdl *cmdl); int run_cmd(struct nlmsghdr *nlh, const struct cmd *caller, const struct cmd *cmds, struct cmdl *cmdl, void *data); -const struct cmd *find_cmd(const struct cmd *cmds, char *str); - #endif From patchwork Thu Nov 15 22:36:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998580 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="2PHUAteq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7G3lvzz9s9G for ; Fri, 16 Nov 2018 09:36:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389024AbeKPIqj (ORCPT ); Fri, 16 Nov 2018 03:46:39 -0500 Received: from mail-pf1-f172.google.com ([209.85.210.172]:44275 "EHLO mail-pf1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726665AbeKPIqi (ORCPT ); Fri, 16 Nov 2018 03:46:38 -0500 Received: by mail-pf1-f172.google.com with SMTP id b81-v6so9880228pfe.11 for ; Thu, 15 Nov 2018 14:36:55 -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=6Gg/uIfGUcjx/0kmqEWh68Dq7JG3Tuzw+68MESAlUyM=; b=2PHUAteqTu+9WF6gY357IIfWxdlpMSGRkk0H1uU1PzUp6STN4YM9zDSkIMggPh6ADz /A4wCt+bn3hbzRwjNSBbVYL0t0M+f5Z9obO8cIrV4faoNe7jNjZfneyE7x2IGjssgkFS GmAAiymsC/YwDCBUa1SBK0xCeGKtN8lANbbJ3t0wMipv5ID/P1+BQscihTli6JreSvkN 9rhki5O7JC1WCBsD/st9nvmKCRyRvXKPpYoRNusmL9/z9rPqgLTITIevbrITSGRK5mNh Y9aR8b23tqJwAWW/Leo6+Dlfgif9G8Syv5MgVDCn2Ig2kGWnacSzaMwR0mDqWfz1Ixyl VbXw== 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=6Gg/uIfGUcjx/0kmqEWh68Dq7JG3Tuzw+68MESAlUyM=; b=cnctqVI4aCezi+vo/v7RvkPlF2VeMW0h2Q3kmAIsFayNgOUsVLDT5XglU1K7KYr/+c js0YShpvlfZYRjs6pr23mncqvGz8+CfVUoGAYchZymXxstfr16phNaEUzbbfVRZhKATl slfLLvI5Z5Wjg4WJKSSZ4/kAN1e/XCccViyfYMKsqC13SINqjmAW0c9akFhzmPUeRsWW z+c8m4iyCPu3NT2FqJluQ/74ib8Qzq/ykzMw/WFkB7yoeMwROk4OV2rjx91Ie1NF/VVJ e3rB64xCrV21J6xVb0iDfE3RAdS/GixlgbvqAgL5jU37gDWCXKtqufvz6n6DsS7lHFIW 8vfg== X-Gm-Message-State: AGRZ1gJIGHt09xakJiqSY76PGJtIs81elv+HxhYSMjfDVCMVfbAbJqyl vBY/zOsxmD43wgylc/z+6J/3WH+jI5Rj7g== X-Google-Smtp-Source: AJdET5cUmSPbNNmz/zE8UGKTSXsejsdjaTahX9gIjkuamk5Cl8HMBFjsViyj7avMyjWqDmPlBMAhYQ== X-Received: by 2002:a63:3e05:: with SMTP id l5mr7063518pga.96.1542321414080; Thu, 15 Nov 2018 14:36:54 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:53 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 13/22] tc/class: make filter variables static Date: Thu, 15 Nov 2018 14:36:31 -0800 Message-Id: <20181115223640.411-14-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 Only used in this file. Signed-off-by: Stephen Hemminger --- tc/tc_class.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tc/tc_class.c b/tc/tc_class.c index 7e4e17fd7f39..7ac700d7ab31 100644 --- a/tc/tc_class.c +++ b/tc/tc_class.c @@ -153,9 +153,9 @@ static int tc_class_modify(int cmd, unsigned int flags, int argc, char **argv) return 0; } -int filter_ifindex; -__u32 filter_qdisc; -__u32 filter_classid; +static int filter_ifindex; +static __u32 filter_qdisc; +static __u32 filter_classid; static void graph_node_add(__u32 parent_id, __u32 id, void *data, int len) From patchwork Thu Nov 15 22:36:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998581 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="WsRivGMm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7H1gnxz9s9h for ; Fri, 16 Nov 2018 09:36:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389042AbeKPIqk (ORCPT ); Fri, 16 Nov 2018 03:46:40 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39574 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389029AbeKPIqj (ORCPT ); Fri, 16 Nov 2018 03:46:39 -0500 Received: by mail-pg1-f193.google.com with SMTP id r9-v6so9649509pgv.6 for ; Thu, 15 Nov 2018 14:36:55 -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=GhPBM9c+Hm0ZHIt/nSZD62SBaFFSjNa/2eLtvimxF9w=; b=WsRivGMmZ4DAKCeoLwy93es7ex3HwWx6GojzxTLuvL4cT9yH4j7lnKNKS9EUodGL3N eAHuHz9PPP/JQnpIpipA5fSnn+979cjXMxs4cdHGTuPu/NumOZypzwR1hq9MDIW4h/pW pELux7IZYNSmsfYXef2EGs6IJ8BRLDPHZpLDpDFGpczGe84elkfCg5vUrvqKal2XV2b+ A6JSbtcvGpyWYGJu3AOQ5P56iaTNBaX5VZpozt09q31XaALfDrZ2X3Wz7447DufLQfzQ bF/OwHgyKp49W1hpNFZ+4VBUYTL5tUXh6XNLRjLeDDPiRltciPeuBreur3iDOnPZXTX+ ckBw== 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=GhPBM9c+Hm0ZHIt/nSZD62SBaFFSjNa/2eLtvimxF9w=; b=t5S+nL5hqyg56aZ/ZStdrHwZkzHm8Dgekg0Yy5R9yv6mfyU3hHiQ522wJZj6pD9N0o sq7fhlUMzj5Ud/AF6jH2L1SeFTgN/MPgUesJ61XZe22gSsX2IQAN1RTtlcHMwhpQXUpx rRhSujfMxiugx6d06fD/D3UFqcTZjNxPXOUmLE21SUJg2NBThHwt+30eVMaf3KlFMQkt 9gpx0guWPJHONv7VehtKRwSrIkCSY+zInIZpjxHmAdzriwBUQpSnyNuQRWs5C0buhIxJ gaQ97Dc8WHYAdVyinc+7R1O/JFoU/4da2MCL2qB7lSUNFjYzf2RYPa+ZWHUfS7w11KB7 G7BQ== X-Gm-Message-State: AGRZ1gJ5r9sXkvFX6XHBcmtmVzaRu9asIv/hO5IrJTGrzyKpX6tNS/VC oEfvyBG+FdgXlBNk7zlQZPWynK25JR4KeA== X-Google-Smtp-Source: AJdET5fks1IAMtcLHfsoqJs4KYeFoKFUkMif1/3E9zBepGbR06hDdLwHAKjMDXLKhbXB+PV9/KB/GA== X-Received: by 2002:a63:4706:: with SMTP id u6mr7143896pga.95.1542321414863; Thu, 15 Nov 2018 14:36:54 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:54 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 14/22] tc/police: make print_police static Date: Thu, 15 Nov 2018 14:36:32 -0800 Message-Id: <20181115223640.411-15-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 print_police function only used by m_police. Signed-off-by: Stephen Hemminger --- tc/m_police.c | 10 +++++++--- tc/tc_util.h | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tc/m_police.c b/tc/m_police.c index f3b07f7b0439..d645999ba08b 100644 --- a/tc/m_police.c +++ b/tc/m_police.c @@ -25,6 +25,10 @@ #include "utils.h" #include "tc_util.h" +static int act_parse_police(struct action_util *a, int *argc_p, + char ***argv_p, int tca_id, struct nlmsghdr *n); +static int print_police(struct action_util *a, FILE *f, struct rtattr *tb); + struct action_util police_action_util = { .id = "police", .parse_aopt = act_parse_police, @@ -50,8 +54,8 @@ static void explain1(char *arg) fprintf(stderr, "Illegal \"%s\"\n", arg); } -int act_parse_police(struct action_util *a, int *argc_p, char ***argv_p, - int tca_id, struct nlmsghdr *n) +static int act_parse_police(struct action_util *a, int *argc_p, char ***argv_p, + int tca_id, struct nlmsghdr *n) { int argc = *argc_p; char **argv = *argv_p; @@ -256,7 +260,7 @@ int parse_police(int *argc_p, char ***argv_p, int tca_id, struct nlmsghdr *n) return act_parse_police(NULL, argc_p, argv_p, tca_id, n); } -int print_police(struct action_util *a, FILE *f, struct rtattr *arg) +static int print_police(struct action_util *a, FILE *f, struct rtattr *arg) { SPRINT_BUF(b1); SPRINT_BUF(b2); diff --git a/tc/tc_util.h b/tc/tc_util.h index 76fd986d6e4c..e22c6da25696 100644 --- a/tc/tc_util.h +++ b/tc/tc_util.h @@ -117,9 +117,6 @@ int parse_action_control_slash(int *argc_p, char ***argv_p, int *result1_p, int *result2_p, bool allow_num); void print_action_control(FILE *f, const char *prefix, int action, const char *suffix); -int act_parse_police(struct action_util *a, int *argc_p, - char ***argv_p, int tca_id, struct nlmsghdr *n); -int print_police(struct action_util *a, FILE *f, struct rtattr *tb); int police_print_xstats(struct action_util *a, FILE *f, struct rtattr *tb); int tc_print_action(FILE *f, const struct rtattr *tb, unsigned short tot_acts); int tc_print_ipt(FILE *f, const struct rtattr *tb); From patchwork Thu Nov 15 22:36:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998589 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="XTZcj8kA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7f1tGwz9s3q for ; Fri, 16 Nov 2018 09:37:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389113AbeKPIq7 (ORCPT ); Fri, 16 Nov 2018 03:46:59 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:46491 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726665AbeKPIqk (ORCPT ); Fri, 16 Nov 2018 03:46:40 -0500 Received: by mail-pg1-f193.google.com with SMTP id w7so9634810pgp.13 for ; Thu, 15 Nov 2018 14:36:56 -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=foNfklvbxDyxKyLJHuTGH9pCUtNTSZAs70dP9plsekE=; b=XTZcj8kAWGLnQfAkxGWWKvyIIqH+yX0xtMgUJN2m7EORYduML+4iGWKThwQ2xEpLVv Owyk46+NDVNSEEd7mb0jZUuK4+VBrHJXOp101XCY5dDIQKFdhPGhGXpTaGQjKKO4K/Gb iCnnaLB9ahmFA4uM0wEZ1fy1ZHLmNm1fIkCjakkIARygmTXvN/mBnGCWT+BxNvoZ9KRn h5Ua2z+ziP1A1FIUYsa7NgEc6vDuYpqkjZbNQixJMMzXaq2SihsG00fWzNgv3F6Jn531 Zx9uZkiRs9kYdmlVvm1VTPwatV75hOlaHHrP0cYDnaXIkwktmIC+jrn41R6FXyX9C5kw b5dg== 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=foNfklvbxDyxKyLJHuTGH9pCUtNTSZAs70dP9plsekE=; b=sUQfRx2fdMPLPTf8qWPSrxYWJUGC10B5IBvw2zoUFEcvb5ZL+VAvCK7fpOPU8MR0i1 QsbPDCa/NblhzcMKDkiv2JXYVDtmQWd3tRsrol9CsaZnCtWxeQC5NwFy+iOTsOoNLQy/ 15qpqeu0sLrdiDjDjgCsFRyA80fmfj2ZqDlhrs0ISieyPJadAfGXcPVh8evl090K2moN +GarpwDIykN/2bhAop4Yp07XXjYWk8V142CDszO7byD2mtjnRFf8NI6Hxvngl9moLYqu hhSYFVdk9+hf/eSAiMMce110l1uScJLUGdcd4LK0lYOAB4nbgvdXiHOcVnMenoQbYdzb OG4Q== X-Gm-Message-State: AGRZ1gI1ivXNlSjoYRV6vJkjur7JlE+hH22azhjx2AWQ46sbNgz34XWm +dpzkhZ8yCFINYingppOEdUgA7M7K7mFmQ== X-Google-Smtp-Source: AJdET5fyiTDC/l1TN6ieaB+BdliKbFmoUe4ml3MydOIAf5eOo+VZK0uFfL7er1leiYPBSl+DFhW7vw== X-Received: by 2002:a63:2109:: with SMTP id h9mr7451942pgh.277.1542321415616; Thu, 15 Nov 2018 14:36:55 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:54 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 15/22] ss: make local variables static Date: Thu, 15 Nov 2018 14:36:33 -0800 Message-Id: <20181115223640.411-16-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 variables only used in this code. Signed-off-by: Stephen Hemminger --- misc/ss.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 4d12fb5d19df..e4d6ae489e79 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -96,20 +96,20 @@ static int security_get_initial_context(char *name, char **context) } #endif -int resolve_services = 1; +static int resolve_services = 1; int preferred_family = AF_UNSPEC; -int show_options; +static int show_options; int show_details; -int show_users; -int show_mem; -int show_tcpinfo; -int show_bpf; -int show_proc_ctx; -int show_sock_ctx; -int show_header = 1; -int follow_events; -int sctp_ino; -int show_tipcinfo; +static int show_users; +static int show_mem; +static int show_tcpinfo; +static int show_bpf; +static int show_proc_ctx; +static int show_sock_ctx; +static int show_header = 1; +static int follow_events; +static int sctp_ino; +static int show_tipcinfo; enum col_id { COL_NETID, @@ -494,7 +494,7 @@ struct user_ent { }; #define USER_ENT_HASH_SIZE 256 -struct user_ent *user_ent_hash[USER_ENT_HASH_SIZE]; +static struct user_ent *user_ent_hash[USER_ENT_HASH_SIZE]; static int user_ent_hashfn(unsigned int ino) { @@ -1404,7 +1404,7 @@ struct scache { const char *proto; }; -struct scache *rlist; +static struct scache *rlist; static void init_service_resolver(void) { From patchwork Thu Nov 15 22:36:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998582 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="slWY+1ZC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7K0Kjlz9s9G for ; Fri, 16 Nov 2018 09:37:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389052AbeKPIqm (ORCPT ); Fri, 16 Nov 2018 03:46:42 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:38868 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389029AbeKPIqm (ORCPT ); Fri, 16 Nov 2018 03:46:42 -0500 Received: by mail-pl1-f196.google.com with SMTP id e5so126158plb.5 for ; Thu, 15 Nov 2018 14:36:58 -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=yQN+c1zUTJVHGAUJxo47TTMNSlWeWmPy1mlyt3G7PYE=; b=slWY+1ZCw6h46r993+lKvlBpMW9pAqCQ+wvKpm5T/3BEQRL7yaBN6BGSPpqgov0+0o piRo64c/pdZY1QLFFUhg9pzxl1evRSTTkbLZyo6Ts3zDitPkuIUTCA53OPxLSdN3wmte KbEOPEcUwnbh2881QDrAQwGFF4rLtdS4J8tc/zUlL9Boy2TZsf71qzto9UUlEmV1UKSQ DYtmZNBrmf3X/pOdxFFkklRcfxjCvGvbCBq49umwyw92SNt2sIvxnuHUKHvIqmbDq+2+ 96Bu1q4RLXLApzgYtcIr7H0BLJDdjpWxh+7+ZWGOLphgQuzGa/ZWRWlphDUDswv48hdg q9tQ== 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=yQN+c1zUTJVHGAUJxo47TTMNSlWeWmPy1mlyt3G7PYE=; b=KewV24GjjM154xLEBMC9P9t1Hcf9tHArCryhKod6+0bHYVOpCwDqaJXCZWBFIA8eb8 JN4V38Qe1t1daYy2UD0s1Sn/fddb9kIrRTw1s/QQj1xoC1z3DhyK3ogsB3PgnN6ER3zn espWxBRPTmhYvyseA1ZgHU0c6DIy91PDl4FN96WVxC2eoSVVUscgCHyuch3Q2VTwTasL HlR6m1+eshRFdiYehr46PRlu/b6sfd5KF+ub6akHv++tIZUqyPe7IbCIg8Tport0JvJK TZpb+vS2eDaco5pxBTy/GDyYps9XdIjBSJ6PoewZM+6nnrN67+wR+91IRicmL1bG0YYD VoBQ== X-Gm-Message-State: AGRZ1gI6A9hZilnxzanuTKYF4GsZaduHDmsYY6qUNC2ndp1JRG/g5kLT nh3irpBPDGoeic3Nb8hjL/TJ5zXwjiw0vQ== X-Google-Smtp-Source: AJdET5fP42uz1upsABb62Qdrhdenj8Yzh6fpWQICHoTk69g//dndocZB0O+El09oRSSTjBex4TGtVw== X-Received: by 2002:a17:902:1347:: with SMTP id r7-v6mr8140112ple.238.1542321417456; Thu, 15 Nov 2018 14:36:57 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:56 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 16/22] tc/pedit: make functions static Date: Thu, 15 Nov 2018 14:36:34 -0800 Message-Id: <20181115223640.411-17-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 The parse and pack functions are only used by the pedit routines. Signed-off-by: Stephen Hemminger --- tc/m_pedit.c | 33 ++++++++++++++------------------- tc/m_pedit.h | 15 --------------- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/tc/m_pedit.c b/tc/m_pedit.c index 2aeb56d9615f..6f8d078b7d3c 100644 --- a/tc/m_pedit.c +++ b/tc/m_pedit.c @@ -118,7 +118,7 @@ noexist: return p; } -int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey) +static int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey) { struct tc_pedit_sel *sel = &_sel->sel; struct m_pedit_key_ex *keys_ex = _sel->keys_ex; @@ -155,8 +155,8 @@ int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey) return 0; } -int pack_key32(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey) +static int pack_key32(__u32 retain, struct m_pedit_sel *sel, + struct m_pedit_key *tkey) { if (tkey->off > (tkey->off & ~3)) { fprintf(stderr, @@ -169,8 +169,8 @@ int pack_key32(__u32 retain, struct m_pedit_sel *sel, return pack_key(sel, tkey); } -int pack_key16(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey) +static int pack_key16(__u32 retain, struct m_pedit_sel *sel, + struct m_pedit_key *tkey) { int ind, stride; __u32 m[4] = { 0x0000FFFF, 0xFF0000FF, 0xFFFF0000 }; @@ -197,10 +197,10 @@ int pack_key16(__u32 retain, struct m_pedit_sel *sel, printf("pack_key16: Final val %08x mask %08x\n", tkey->val, tkey->mask); return pack_key(sel, tkey); - } -int pack_key8(__u32 retain, struct m_pedit_sel *sel, struct m_pedit_key *tkey) +static int pack_key8(__u32 retain, struct m_pedit_sel *sel, + struct m_pedit_key *tkey) { int ind, stride; __u32 m[4] = { 0x00FFFFFF, 0xFF00FFFF, 0xFFFF00FF, 0xFFFFFF00 }; @@ -283,7 +283,7 @@ static int pack_ipv6(struct m_pedit_sel *sel, struct m_pedit_key *tkey, return 0; } -int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type) +static int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type) { int argc = *argc_p; char **argv = *argv_p; @@ -433,8 +433,8 @@ done: } -int parse_offset(int *argc_p, char ***argv_p, struct m_pedit_sel *sel, - struct m_pedit_key *tkey) +static int parse_offset(int *argc_p, char ***argv_p, struct m_pedit_sel *sel, + struct m_pedit_key *tkey) { int off; __u32 len, retain; @@ -612,8 +612,8 @@ static int pedit_keys_ex_addattr(struct m_pedit_sel *sel, struct nlmsghdr *n) return 0; } -int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, - struct nlmsghdr *n) +static int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, + int tca_id, struct nlmsghdr *n) { struct m_pedit_sel sel = {}; @@ -705,7 +705,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, return 0; } -const char *pedit_htype_str[] = { +static const char * const pedit_htype_str[] = { [TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK] = "", [TCA_PEDIT_KEY_EX_HDR_TYPE_ETH] = "eth", [TCA_PEDIT_KEY_EX_HDR_TYPE_IP4] = "ipv4", @@ -730,7 +730,7 @@ static void print_pedit_location(FILE *f, fprintf(f, "%c%d", (int)off >= 0 ? '+' : '-', abs((int)off)); } -int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) +static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) { struct tc_pedit_sel *sel; struct rtattr *tb[TCA_PEDIT_MAX + 1]; @@ -826,11 +826,6 @@ int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) return 0; } -int pedit_print_xstats(struct action_util *au, FILE *f, struct rtattr *xstats) -{ - return 0; -} - struct action_util pedit_action_util = { .id = "pedit", .parse_aopt = parse_pedit, diff --git a/tc/m_pedit.h b/tc/m_pedit.h index b6b274bd08c7..5d3628a70b99 100644 --- a/tc/m_pedit.h +++ b/tc/m_pedit.h @@ -71,22 +71,7 @@ struct m_pedit_util { struct m_pedit_key *tkey); }; -int pack_key(struct m_pedit_sel *sel, struct m_pedit_key *tkey); -int pack_key32(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey); -int pack_key16(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey); -int pack_key8(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey); -int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type); int parse_cmd(int *argc_p, char ***argv_p, __u32 len, int type, __u32 retain, struct m_pedit_sel *sel, struct m_pedit_key *tkey); -int parse_offset(int *argc_p, char ***argv_p, - struct m_pedit_sel *sel, struct m_pedit_key *tkey); -int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, - int tca_id, struct nlmsghdr *n); -int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg); -int pedit_print_xstats(struct action_util *au, FILE *f, - struct rtattr *xstats); #endif From patchwork Thu Nov 15 22:36:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998583 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="i4EhFiuC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7K6ptMz9s9h for ; Fri, 16 Nov 2018 09:37:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389062AbeKPIqn (ORCPT ); Fri, 16 Nov 2018 03:46:43 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:37171 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389040AbeKPIqm (ORCPT ); Fri, 16 Nov 2018 03:46:42 -0500 Received: by mail-pg1-f194.google.com with SMTP id 80so9655097pge.4 for ; Thu, 15 Nov 2018 14:36:58 -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=lElUML8uR/3lc5CPqhhCnzQMgqQhuN1cS93ohNJAyGU=; b=i4EhFiuCqVgv+MXdjV9Ju4hsxdrO2mqZv6fbPM8vkwkdJFu6qv3ay0pzA3Fw/XsThv 5hyGhFMhFlYtsH+PCABjszZlpRwfZk69hFmWWSdq0cJ3jqfzP456YgFISGir8V7Yd28/ 45v2nhwVvSj0HQ3c/8Vc/0rj1eZS6cmXbm2zV45EGayKn7E+b4Kgi5t8F/85aKBSxGPh CritzM0mF52q/WvnUj5Pnh7e7NANujOfXRJars+HyRZRMOiTDMOFEyn3adXshzPSdFQf Upop0mH2JDXJqEhIpgcEjhBqLbd1jRjDCQZXw703k94KVJBMHVNPzIg2L91KonXXXZTE OrfQ== 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=lElUML8uR/3lc5CPqhhCnzQMgqQhuN1cS93ohNJAyGU=; b=dekiwoxJonKN42maETfisZ2ijQK7umcZCQdlrgD5RtPaAuskapoi5QbBWRz7JEBqNZ Ff+S735DyEU37f7BTRrzEVDncXnkRVjO+Rhb9120PHpKu48I/Z2A5QsboCq8XNBMOgxA 1TRG6YN5Tn6deIne5R2mdB+8sejrUATjV0bMxpkP8NwHA5b0ezr9Wr5QVNscxeW6PGaq uUxRU6V0pKl/DgL4kyk52LHPrSba7gYCzc6GY1bZEYgqLaD+ROlxQvmfiyBVRE3YDq07 U/CApXmaLpPaSF3Y/QdbsFPeh40QlX0F5VazXUQvolU9NaY7s3RFvT+GWo0BZc9XuqJ+ 4eJA== X-Gm-Message-State: AGRZ1gLoXdrMg7Ef4XT09n/wMj3syx4d6P69NPgO+Kx6zoLfNvMD4dHB /uqDUU3vFls/7spipxp5AjUftHJzc7wQqg== X-Google-Smtp-Source: AJdET5dVOAhB1GW4zU36+K1r1QAZ2wHl2k/HicownVOBtllxNMCArgUgJfFkayg8HQczAYPhc2CvOw== X-Received: by 2002:a63:2586:: with SMTP id l128mr7697556pgl.104.1542321418182; Thu, 15 Nov 2018 14:36:58 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:57 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 17/22] tc/ematch: make local functions static Date: Thu, 15 Nov 2018 14:36:35 -0800 Message-Id: <20181115223640.411-18-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 The print handling is only used in tc/m_ematch.c Remove unused function to print_ematch_tree. Signed-off-by: Stephen Hemminger --- tc/m_ematch.c | 30 +++--------------------------- tc/m_ematch.h | 1 - 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/tc/m_ematch.c b/tc/m_ematch.c index a524b520b276..8840a0dc62a1 100644 --- a/tc/m_ematch.c +++ b/tc/m_ematch.c @@ -38,6 +38,8 @@ struct ematch *ematch_root; static int begin_argc; static char **begin_argv; +static void bstr_print(FILE *fd, const struct bstr *b, int ascii); + static inline void map_warning(int num, char *kind) { fprintf(stderr, @@ -548,7 +550,7 @@ unsigned long bstrtoul(const struct bstr *b) return l; } -void bstr_print(FILE *fd, const struct bstr *b, int ascii) +static void bstr_print(FILE *fd, const struct bstr *b, int ascii) { int i; char *s = b->data; @@ -565,29 +567,3 @@ void bstr_print(FILE *fd, const struct bstr *b, int ascii) fprintf(fd, "\""); } } - -void print_ematch_tree(const struct ematch *tree) -{ - const struct ematch *t; - - for (t = tree; t; t = t->next) { - if (t->inverted) - printf("NOT "); - - if (t->child) { - printf("("); - print_ematch_tree(t->child); - printf(")"); - } else { - struct bstr *b; - - for (b = t->args; b; b = b->next) - printf("%s%s", b->data, b->next ? " " : ""); - } - - if (t->relation == TCF_EM_REL_AND) - printf(" AND "); - else if (t->relation == TCF_EM_REL_OR) - printf(" OR "); - } -} diff --git a/tc/m_ematch.h b/tc/m_ematch.h index 356f2eded7fc..c4443ee22942 100644 --- a/tc/m_ematch.h +++ b/tc/m_ematch.h @@ -51,7 +51,6 @@ static inline struct bstr *bstr_next(struct bstr *b) } unsigned long bstrtoul(const struct bstr *b); -void bstr_print(FILE *fd, const struct bstr *b, int ascii); struct ematch { struct bstr *args; From patchwork Thu Nov 15 22:36:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998584 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="kfLNCqR9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7M032gz9s9G for ; Fri, 16 Nov 2018 09:37:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389071AbeKPIqo (ORCPT ); Fri, 16 Nov 2018 03:46:44 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:44887 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389029AbeKPIqo (ORCPT ); Fri, 16 Nov 2018 03:46:44 -0500 Received: by mail-pf1-f195.google.com with SMTP id b81-v6so9880317pfe.11 for ; Thu, 15 Nov 2018 14:37:00 -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=5y3KNnJWPd/TgjREGPvYsuuVtg0igS5/roSG4jsBsao=; b=kfLNCqR9ZPMnluPUYjNTzhZN8AwC8PmK7dWpk6OwTa8EruInpi78wGLe/SbwOkjKzC j9F2xTQIwjff2dTSKHnFC3uEkhvmVTbOG3DBxi/Kx/F4RIE68cjR7dw9EKKpUJLwgJNR Nib2mI7bTRzKd3YoEjAMbmCwjZTr2hSInvqjNZG9PtxPdLIQR+NeMmenlLlFTkv1Keop SsEqhK1NLICUBgJ/g1cYh/NdK6x2Lm6z7gMlIh0SeYxeQ6ylTpuqOqvuKC4zmnSW/oPq Y205zHOevwfDjHYJpR3Z3Gg+3hnrj2BJeTMwLYv9+icqwm5w0/IpW4QAp2DWBrmZ1hsM xbFw== 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=5y3KNnJWPd/TgjREGPvYsuuVtg0igS5/roSG4jsBsao=; b=eTc4A1UoE6NKdfHr+F6XImQWniiRGf752fhd7qsjV8t6YKdRR3eoKcw91XfJ3PEXE6 5PhT2fVICn4l8MHYgrTNu/KN6KcpJwpiXnXp5dZXTVTrqHqtt4qyv1nt6xeVd3Z2YrML lLntQLeIKkG1PfUzh/8rI1VDQN+otreZZCP+wAlYt0x8ZTVis+rTKfGC86DVmNGyALQx FQByd8th2AI1CloN8cWPAMKLtXtb5TgqOV4yP3FQFAE0Z2N78xvbMbPnDJOdsyWiDc6n WsJyLoR2R/SKDBOqLuqIhuAwyuajSjIY8HwEXy3oKPRDkTMgtaiLMXwMlbs9xlRGrJ3/ GWvw== X-Gm-Message-State: AGRZ1gJy/ceq7Ah913wsvdFC2FTyfAlfB4uD2Y4hB+Zj8z4majAFL0u1 JkuHL2SLhNnecFYImu7UHUsqYdBIzTaFEQ== X-Google-Smtp-Source: AJdET5dSiHY6Adue5L4PG3ojvak2A+bKqNDlgl8fYnqX6NPyegJrlBrIQIiq41yaHafjeOgaSWkX7A== X-Received: by 2002:a63:6483:: with SMTP id y125mr7427646pgb.91.1542321419497; Thu, 15 Nov 2018 14:36:59 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:58 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 18/22] tc/util: make local functions static Date: Thu, 15 Nov 2018 14:36:36 -0800 Message-Id: <20181115223640.411-19-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 The tc util library parse/print has functions only used locally (and some dead code removed). Signed-off-by: Stephen Hemminger --- tc/tc_util.c | 17 +++-------------- tc/tc_util.h | 5 ----- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/tc/tc_util.c b/tc/tc_util.c index a082c73c9350..82856a85170b 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -190,7 +190,7 @@ static const struct rate_suffix { { NULL } }; -int parse_percent_rate(char *rate, const char *str, const char *dev) +static int parse_percent_rate(char *rate, const char *str, const char *dev) { long dev_mbit; int ret; @@ -409,7 +409,7 @@ void print_devname(enum output_type type, int ifindex) "dev", "%s ", ifname); } -void print_size(char *buf, int len, __u32 sz) +static void print_size(char *buf, int len, __u32 sz) { double tmp = sz; @@ -427,17 +427,6 @@ char *sprint_size(__u32 size, char *buf) return buf; } -void print_qdisc_handle(char *buf, int len, __u32 h) -{ - snprintf(buf, len, "%x:", TC_H_MAJ(h)>>16); -} - -char *sprint_qdisc_handle(__u32 h, char *buf) -{ - print_qdisc_handle(buf, SPRINT_BSIZE-1, h); - return buf; -} - static const char *action_n2a(int action) { static char buf[64]; @@ -709,7 +698,7 @@ int get_linklayer(unsigned int *val, const char *arg) return 0; } -void print_linklayer(char *buf, int len, unsigned int linklayer) +static void print_linklayer(char *buf, int len, unsigned int linklayer) { switch (linklayer) { case LINKLAYER_UNSPEC: diff --git a/tc/tc_util.h b/tc/tc_util.h index e22c6da25696..825fea36a080 100644 --- a/tc/tc_util.h +++ b/tc/tc_util.h @@ -73,7 +73,6 @@ const char *get_tc_lib(void); struct qdisc_util *get_qdisc_kind(const char *str); struct filter_util *get_filter_kind(const char *str); -int parse_percent_rate(char *rate, const char *str, const char *dev); int get_qdisc_handle(__u32 *h, const char *str); int get_rate(unsigned int *rate, const char *str); int get_percent_rate(unsigned int *rate, const char *str, const char *dev); @@ -84,14 +83,10 @@ int get_size_and_cell(unsigned int *size, int *cell_log, char *str); int get_linklayer(unsigned int *val, const char *arg); void print_rate(char *buf, int len, __u64 rate); -void print_size(char *buf, int len, __u32 size); -void print_qdisc_handle(char *buf, int len, __u32 h); -void print_linklayer(char *buf, int len, unsigned int linklayer); void print_devname(enum output_type type, int ifindex); char *sprint_rate(__u64 rate, char *buf); char *sprint_size(__u32 size, char *buf); -char *sprint_qdisc_handle(__u32 h, char *buf); char *sprint_tc_classid(__u32 h, char *buf); char *sprint_ticks(__u32 ticks, char *buf); char *sprint_linklayer(unsigned int linklayer, char *buf); From patchwork Thu Nov 15 22:36:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998585 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="nE2oFqZ2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7Q0jgZz9s3q for ; Fri, 16 Nov 2018 09:37:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389104AbeKPIqs (ORCPT ); Fri, 16 Nov 2018 03:46:48 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:37930 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389029AbeKPIqp (ORCPT ); Fri, 16 Nov 2018 03:46:45 -0500 Received: by mail-pf1-f196.google.com with SMTP id q1so2381941pfi.5 for ; Thu, 15 Nov 2018 14:37:01 -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=2rYui+IIPfhkdWJmdwYIEVDvqzaOH65IuJrcy1e8r6c=; b=nE2oFqZ22R9n9zAyDzuNCBgIZAzpf2tkKcJETNKJc1kzHssluPN41ysFZootOvEuCa mjs6uZ6qw91H4kBiVeJ72z6FXzn2Cp6MwWhMQ+lzc+8sRYkeP+YmLoINC4Kq+asDHwLN 4+Kawr+LfAUbITFcSRSN+1ZQ/+KiugR7ffBF+SdRkNxWtvduoITMz0c6Rt7C+9TgYUCg gs1Y/gx6ioNOzCHiWe2BUy7tbBvezZrotiV6pBMCDZvLEMqg041VjQUzOtgNBfOJC9Fe uxkq8RfDcjcrwjY2e9iB4ACqrJWdNUZysfHWLjfuoHpITOgbufEAaxLrub4/zXcgpAPG bt3Q== 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=2rYui+IIPfhkdWJmdwYIEVDvqzaOH65IuJrcy1e8r6c=; b=BPJDhNSG6NrCRn1CAr+pj8Pz9uTyMdaSfVl/ZZxEE38Cql5xNCzBSwSYL8fa+vZNMG 4dY+Os+V3NLL7LYg3EM6Yuk1q35YQ4aYqSURKTXyYZHOcZ1MJ9XCQBfOJyuYDEaaMqmI sjELcKBLMOUELoIWotlRXZv1CdALwWVj0dPHJVTVkFZwCfWunDa0n5tpuurEo46PtfaP T8gaPlWc7nAb07b1nMJHB+xtBks4PeVzmA8EdaM/T+jK6MKysSJe+R30rWrVMcgwwcrm /r48n/+IIpKgVlZZNALkznSlB5P8t13Lld/9+gYK+oxAcmz6/YNNKzKH9amDskQs49iI ZgcQ== X-Gm-Message-State: AGRZ1gIfj20HeWSBgDGJIj2SlxDXGM4lq53/x2UyIZQbPATaFN39ntcG /3Iu5EWbPC/kcYQNZhVOXzyEPh29jPqSwQ== X-Google-Smtp-Source: AJdET5e0evqIYMETuP02o05XyDwSK0U6fQJNtYZ2sd36o341cf91M1TTzabiJPJxShC/0VxPwG9gbQ== X-Received: by 2002:a62:89d7:: with SMTP id n84-v6mr8483835pfk.255.1542321420671; Thu, 15 Nov 2018 14:37:00 -0800 (PST) Received: from localhost.localdomain ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id c23-v6sm30580084pfn.95.2018.11.15.14.36.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:36:59 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 19/22] tc/meta: make meta_table static and const Date: Thu, 15 Nov 2018 14:36:37 -0800 Message-Id: <20181115223640.411-20-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 The mapping table is only used by em_meta. Signed-off-by: Stephen Hemminger --- tc/em_meta.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tc/em_meta.c b/tc/em_meta.c index d94fe88d9b2f..2ddc65ed6cb6 100644 --- a/tc/em_meta.c +++ b/tc/em_meta.c @@ -38,7 +38,7 @@ static void meta_print_usage(FILE *fd) "For a list of meta identifiers, use meta(list).\n"); } -struct meta_entry { +static const struct meta_entry { int id; char *kind; char *mask; @@ -121,7 +121,7 @@ static inline int map_type(char k) return INT_MAX; } -static struct meta_entry *lookup_meta_entry(struct bstr *kind) +static const struct meta_entry *lookup_meta_entry(struct bstr *kind) { int i; @@ -133,7 +133,7 @@ static struct meta_entry *lookup_meta_entry(struct bstr *kind) return NULL; } -static struct meta_entry *lookup_meta_entry_byid(int id) +static const struct meta_entry *lookup_meta_entry_byid(int id) { int i; @@ -168,8 +168,8 @@ static inline void dump_value(struct nlmsghdr *n, int tlv, unsigned long val, static inline int is_compatible(struct tcf_meta_val *what, struct tcf_meta_val *needed) { + const struct meta_entry *entry; char *p; - struct meta_entry *entry; entry = lookup_meta_entry_byid(TCF_META_ID(what->kind)); @@ -249,7 +249,7 @@ static inline struct bstr * parse_object(struct bstr *args, struct bstr *arg, struct tcf_meta_val *obj, unsigned long *dst, struct tcf_meta_val *left) { - struct meta_entry *entry; + const struct meta_entry *entry; unsigned long num; struct bstr *a; @@ -461,7 +461,7 @@ static int print_object(FILE *fd, struct tcf_meta_val *obj, struct rtattr *rta) { int id = TCF_META_ID(obj->kind); int type = TCF_META_TYPE(obj->kind); - struct meta_entry *entry; + const struct meta_entry *entry; if (id == TCF_META_ID_VALUE) return print_value(fd, type, rta); From patchwork Thu Nov 15 22:36:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998587 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="whPcQoZN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7V0JNXz9s3q for ; Fri, 16 Nov 2018 09:37:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389097AbeKPIqs (ORCPT ); Fri, 16 Nov 2018 03:46:48 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:46289 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389074AbeKPIqq (ORCPT ); Fri, 16 Nov 2018 03:46:46 -0500 Received: by mail-pf1-f193.google.com with SMTP id s9-v6so10359690pfm.13 for ; Thu, 15 Nov 2018 14:37:02 -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=nXz6wDYlaMgzOoPH4vs8q3x2PMgaolkWTlvE1yqEJPM=; b=whPcQoZNt3aNR4eSDA7aMjfcwpa7+Yz7BAx6wm17m5g9RAXIF05qj/BruP0CCGu7VP hTVl0u4eumUWkwvInjFbzEvWvNARlEO7NxZJCbVU0a5iX/rdEgFYHLt0+LXT/ds2slWr 25oCude0GsnTLOkLIoZO68nN0nFN0kbQJ1uI8rDI0DuAoJNS3q+zU8B5Hn73+8U6HW70 xZMuqKNbFnlb+FarLUMNsSudjPZz3LdcTue2RChjgVScFgLwrin6k9iiHtbImnRmpyDY cOxfjxNbMlV8wpssCxXmZEtg8WzN+oXluFlujyJUGAbt01vtVgqUMESdQxzu4hBtyGxN rHfw== 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=nXz6wDYlaMgzOoPH4vs8q3x2PMgaolkWTlvE1yqEJPM=; b=h17LtTxv3ow5w1hD8uo08s9BmhrM6sjtNhDeNDvx3r0NJ83mYHb2gr15t9IfqaVPby mqOLPRr2xFOQi57jPTv9cwV+o2cjJ188rJOmLloGrh+qmkDFC0+PKrDgwkjja1LYCXkk kUcOYr+nT4/+JzStwxv4WiwnyaU8+nwhlsNe6sWo+R6b/N2OBeNy28oMB3h5AJerpIFA Yl6VwUX7zc38QNnZVZ761EQs9wz4IalPEVRMm6mkzFBPdbsNwVZgIfubsnTP5JixIdcj 1bA10uITBqNpUVihKUbam84hYC02zatTxL0pP4ZqYrpjdgesjU019Wrw8AMFjgC6ZHFp BHkQ== X-Gm-Message-State: AGRZ1gI7ONWji+Mbs80exw7krWh8Ihjoli8a/pUsR4oqM7P2Ckb2SQS2 H5SyP9TiJmNB5j1Ytf4R9nNpXlbgUmCeeg== X-Google-Smtp-Source: AJdET5dT93aikLVNgixW7xKgK+RC0kdhR8lEvrCI+SA1/rkPQryBvFvG7W3ubhaUVN1+1R2SSCygUA== X-Received: by 2002:a62:f54f:: with SMTP id n76mr8375659pfh.59.1542321421880; Thu, 15 Nov 2018 14:37:01 -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.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:37:00 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 20/22] tc/action: make variables static Date: Thu, 15 Nov 2018 14:36:38 -0800 Message-Id: <20181115223640.411-21-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 Signed-off-by: Stephen Hemminger --- tc/m_action.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tc/m_action.c b/tc/m_action.c index e90867fc6c25..d5fd5affe703 100644 --- a/tc/m_action.c +++ b/tc/m_action.c @@ -30,9 +30,9 @@ static struct action_util *action_list; #ifdef CONFIG_GACT -int gact_ld; /* f*ckin backward compatibility */ +static int gact_ld; /* f*ckin backward compatibility */ #endif -int tab_flush; +static int tab_flush; static void act_usage(void) { From patchwork Thu Nov 15 22:36:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 998588 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="KeZdH6R5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wx7X13K6z9s9G for ; Fri, 16 Nov 2018 09:37:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389072AbeKPIqr (ORCPT ); Fri, 16 Nov 2018 03:46:47 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:37200 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389076AbeKPIqr (ORCPT ); Fri, 16 Nov 2018 03:46:47 -0500 Received: by mail-pf1-f196.google.com with SMTP id u3-v6so7697707pfm.4 for ; Thu, 15 Nov 2018 14:37:03 -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=PAkHdZKfcljdSMGMUlYM8LlDmcSBflHDS5gNm7JdPUQ=; b=KeZdH6R5YzkYGiUxfraaOzUPTOybePA6QqCf4jwSWd/UFu5RiiyTRJkODrk+/0eVb/ fiO40aw+Kct917VNviHH8ynka+HFXFDWWWV1UzzhDshryTcPKrHb89xkIfQOWHNQKv1g 1mDiPBXlSOvSXyfyKZvwLKXmBoNjHtrMXV3U0prOXpLW1uEvaNW6XfauiS+Yh6iOIDRo +9Y1xcPN7twMN0QBcTGxfXjfTqgSleN9zI13uKpOtVwyTerL3xiaJjdvuBP82JWrBZn6 E+gSd5gGyncOmyWm2uRPwACr+ETkv3wvxuZF/x3SmjF6dbGoC0VTyRYjW911SCSSXMoK jkBw== 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=PAkHdZKfcljdSMGMUlYM8LlDmcSBflHDS5gNm7JdPUQ=; b=G/UWFyD3wp3Rdp+yVl36cWyTPqxAUj1guqWytyxgfi+en7c2exZxmCVCNq/EEA5q7W kLnw/bzA+YvpXFd3jFDw2gowVTrl1x/fNNSD0CgexGMlLgjHtBnRJdL5/9ARnWt0Podu jQRcX3+2TdYoFBofWOZCJPmCwCHj+fUdTnFWDUh0kEwARbs90ZkVZFrQai+KDFYFOKwG zw9+DrzFxQG+BWlTBi6ByrR28sY+ppS61ju1agU8lwo80T+/wtF5C5ZXGVmjqgjBFx5P Z4ziURVwBMRS8ijyTgdoVATnBOIJYtlehCBpaVrAZw2U6PPN69viGSUN2q7ZqHGRSypY KUYA== X-Gm-Message-State: AGRZ1gL4irQ7XT4zKNn+h8AgwFJRY/5oNkb4AXsUQoqqrIBy23Z6u0Hj aneEJ6NOAsjy4ZUgurjmlPreZ6X/nCEaag== X-Google-Smtp-Source: AJdET5fTHwOOx/QFaPWgS6VhjLgNUm9r/FkN8DkvZwuz7zJfYsA9bIp7r02lVVIOT8/Ppe6Gp//Gug== X-Received: by 2002:a62:3948:: with SMTP id g69mr8517561pfa.114.1542321423060; Thu, 15 Nov 2018 14:37:03 -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.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 14:37:02 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 21/22] tc/pedit: use structure initialization Date: Thu, 15 Nov 2018 14:36:39 -0800 Message-Id: <20181115223640.411-22-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 The pedit callback structure table should be iniatialized using structure initialization to avoid structure changes problems. Signed-off-by: Stephen Hemminger --- tc/p_eth.c | 5 ++--- tc/p_icmp.c | 5 ++--- tc/p_ip.c | 5 ++--- tc/p_ip6.c | 5 ++--- tc/p_tcp.c | 5 ++--- tc/p_udp.c | 5 ++--- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/tc/p_eth.c b/tc/p_eth.c index 53ce736a1d78..674f9c11202a 100644 --- a/tc/p_eth.c +++ b/tc/p_eth.c @@ -68,7 +68,6 @@ done: } struct m_pedit_util p_pedit_eth = { - NULL, - "eth", - parse_eth, + .id = "eth", + .parse_peopt = parse_eth, }; diff --git a/tc/p_icmp.c b/tc/p_icmp.c index 2c1baf82f7ad..15ce32309e39 100644 --- a/tc/p_icmp.c +++ b/tc/p_icmp.c @@ -55,7 +55,6 @@ done: } struct m_pedit_util p_pedit_icmp = { - NULL, - "icmp", - parse_icmp, + .id = "icmp", + .parse_peopt = parse_icmp, }; diff --git a/tc/p_ip.c b/tc/p_ip.c index e9fd6f834efc..c385ac6dbcaa 100644 --- a/tc/p_ip.c +++ b/tc/p_ip.c @@ -156,7 +156,6 @@ done: } struct m_pedit_util p_pedit_ip = { - NULL, - "ip", - parse_ip, + .id = "ip", + .parse_peopt = parse_ip, }; diff --git a/tc/p_ip6.c b/tc/p_ip6.c index bc45ab70d319..dbfdca42cce7 100644 --- a/tc/p_ip6.c +++ b/tc/p_ip6.c @@ -84,7 +84,6 @@ done: } struct m_pedit_util p_pedit_ip6 = { - NULL, - "ipv6", - parse_ip6, + .id = "ipv6", + .parse_peopt = parse_ip6, }; diff --git a/tc/p_tcp.c b/tc/p_tcp.c index eeb68fcf87b3..d2dbfd719526 100644 --- a/tc/p_tcp.c +++ b/tc/p_tcp.c @@ -67,7 +67,6 @@ done: return res; } struct m_pedit_util p_pedit_tcp = { - NULL, - "tcp", - parse_tcp, + .id = "tcp", + .parse_peopt = parse_tcp, }; diff --git a/tc/p_udp.c b/tc/p_udp.c index 68c688efd110..bab456de9831 100644 --- a/tc/p_udp.c +++ b/tc/p_udp.c @@ -61,7 +61,6 @@ done: } struct m_pedit_util p_pedit_udp = { - NULL, - "udp", - parse_udp, + .id = "udp", + .parse_peopt = parse_udp, }; 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)