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;