From patchwork Fri Oct 13 13:57:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 825482 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XQ/hgQm4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yD8Rl2Snyz9sNr for ; Sat, 14 Oct 2017 00:57:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758140AbdJMN5h (ORCPT ); Fri, 13 Oct 2017 09:57:37 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34926 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753374AbdJMN5g (ORCPT ); Fri, 13 Oct 2017 09:57:36 -0400 Received: by mail-wr0-f193.google.com with SMTP id y44so988255wry.2 for ; Fri, 13 Oct 2017 06:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gOP81V2SLb1xbrzuhuLH4CE79pSfwQA5dRD++xkoMYQ=; b=XQ/hgQm4i6cPRE2XZuo2107nfTDc5TwGYjTZQwXiylfJ3mCafTTBocYcR8tmwODmMl ws6e3TN6bbRdt/ytMkgh3ciH3u2VmME13pMaD30Ncnwkf52tcrkwDByllGs0KmieHFha EhrUrEBJOIoV0mNyHhSw8RYMX8DqQeU1T3jkuKJklti1v2gl+D2PMax//WqKwjciBQf3 thVFrxztXvFZnE8uJmsQYCaU61yuK1Tg3cotbDiuQOq6MnpoYRQdMgh1K3pykig85Vnx zNebUYEu3CujU6i+zt1GjuBdO7BM/CVOdRloFk8uCbn2lKDVe7CmnzQssOKw/nuVAw61 LY0Q== 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=gOP81V2SLb1xbrzuhuLH4CE79pSfwQA5dRD++xkoMYQ=; b=URv5W8PrT1ztkIJlV0e+bOI5pa1iSrboJ5Chcvcs9TLTdOBv+Z0/ai+N8euLGGhyU2 XSork0+d7xKahge5TAGN+LtP82Cw1QNm/YmBiMRob+d43i4bYj9rpMSzUzVdByeOfFdx dnKj0DTzyRO3IOveOic9Swm2N9y6wfp2+RCDTyx5MsC8XxYSSD3cpOUr8H7XTJmhy+Dj dIkFnYffx/ElBFfoVI9hZ81g/m1Q+PRvIhs/VxJoSnOIQdLSSK+1rIMx+MeBSPB8MpXk 15Rdp3UVUTVDh+tW2wtiRmhJlyo8AnGN0jL5GcPlmXCeCjVgijVp67RakgYANmF+rHRI 9vFA== X-Gm-Message-State: AMCzsaUoQE8cmNRxNSGyeS/DCEM+6xeI3mAXo/kNn2cIHVr+LACZ6Vvg WW0BUQCDtH4Ne0wGSp6W9nUeNg== X-Google-Smtp-Source: AOwi7QCwqTo8TwVVg+9unfFSKyKlPPB8BmxT3Th4hJbdW+zi3dHRH60Cjd1STQ/XkDxhhYzs35XbBg== X-Received: by 10.223.158.74 with SMTP id v10mr1617087wre.201.1507903054911; Fri, 13 Oct 2017 06:57:34 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id q16sm1414348wrg.96.2017.10.13.06.57.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Oct 2017 06:57:34 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Julien Fortin , Stephen Hemminger Subject: [PATCH iproute2 v2 1/4] color: Fix ip segfault when using --color switch Date: Fri, 13 Oct 2017 15:57:16 +0200 Message-Id: <20171013135719.18450-2-petr.vorel@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171013135719.18450-1-petr.vorel@gmail.com> References: <20171013135719.18450-1-petr.vorel@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit d0e72011 ("ip: ipaddress.c: add support for json output") introduced passing -1 as enum color_attr. This is not only wrong as no color_attr has value -1, but also causes another segfault in color_fprintf() on this setup as there is no item with index -1 in array of enum attr_colors[]. Using COLOR_CLEAR is valid option. Reproduce with: $ COLORFGBG='0;15' ip -c a NOTE: COLORFGBG is environmental variable used for defining whether user has light or dark background. COLORFGBG="0;15" is used to ask for color set suitable for light background, COLORFGBG="15;0" is used to ask for color set suitable for dark background. Signed-off-by: Petr Vorel --- include/json_print.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/json_print.h b/include/json_print.h index b6ce1f9f..596af35a 100644 --- a/include/json_print.h +++ b/include/json_print.h @@ -53,7 +53,7 @@ void close_json_array(enum output_type type, const char *delim); const char *fmt, \ type value) \ { \ - print_color_##type_name(t, -1, key, fmt, value); \ + print_color_##type_name(t, COLOR_CLEAR, key, fmt, value); \ } _PRINT_FUNC(int, int); _PRINT_FUNC(bool, bool); From patchwork Fri Oct 13 13:57:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 825483 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZlmdizYq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yD8Rt4dz2z9sPr for ; Sat, 14 Oct 2017 00:57:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758201AbdJMN5n (ORCPT ); Fri, 13 Oct 2017 09:57:43 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33943 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753374AbdJMN5l (ORCPT ); Fri, 13 Oct 2017 09:57:41 -0400 Received: by mail-wr0-f193.google.com with SMTP id l1so991927wrc.1 for ; Fri, 13 Oct 2017 06:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ruh361DvWDl2PD+VntnYojI2GI1GF2q/bwokSAqk+6g=; b=ZlmdizYqxOI68E9JcgYXjqJbRPiNGjv40RlLm7sz9z6W5GU16f5ESM0qQXcRa9HnLv mHBTvYpZmkssSxXEX1HwvW7WhTnMZVG+4VN/ZBxluYEkspgqgck0T+AUibCCKyijGHFm V8Kk0L6obFCV4MiZL+XfwCxlaijmtaVQ5MYcPyKQdqeQ6hBX7fSfdAwjJwCXCEYgCtMJ KWqQjcdz3nigZmyYQJ20oPpzPyPndcg0svRQID6oa4hL4gsVJSNu7HRfUhfsgNoRxh9A CaU+Xs4M9gE+kVQYvz5z2OzOKRx/lKdUZmeCc8YFeOEc745u7Jk0hZLDmF/RtHevSmCJ olQQ== 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=ruh361DvWDl2PD+VntnYojI2GI1GF2q/bwokSAqk+6g=; b=MsClRz3eO6WFEqaGzhYPbd8pL37g12cLBXNyRZVGXumTKYatpX30xYwuvvccKqjZ4z jitaz/kjRbSTOPhy0gBtaBbRv7mUwC7V/Qb1LGgM/+jGU5g0wzrUdDAOpttlQEyDbOpB ocU7V9LRxGEW7/PXswpzM8F+PsSnTeLcAC1F6UhiZANmh6YcQlsrUk7tEUCMdfnBQxu0 SiKaswPW0ilR2X2sRaF2UgdmeAczZtaa8YpDtSH0Ax3WocyX5lLorkiEvhm7UFot1nB2 Z+6rNWU/NELrUu70DcAqoaGGtjHsSHTRf+V4Jq+nY0W+S3uaZH5eH4TUgeVn5jJg4POS XxfA== X-Gm-Message-State: AMCzsaVBIBMRo8OnE6fTggh+flhXYuQWlWkb8XtbRb8Lmk5O7mfJ0Lmf 9vlZJOtOTgGzrjfnRKGY9XmDnQ== X-Google-Smtp-Source: AOwi7QAMU7QmVHHelhMbuhsjrTohkGj1Y+IvZFDdtJZksFd626iFdAw4uT0p9wqNYzjBSq92O11x8w== X-Received: by 10.223.134.157 with SMTP id 29mr1430265wrx.72.1507903060122; Fri, 13 Oct 2017 06:57:40 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id q16sm1414348wrg.96.2017.10.13.06.57.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Oct 2017 06:57:39 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Julien Fortin , Stephen Hemminger Subject: [PATCH iproute2 v2 2/4] color: Fix another ip segfault when using --color switch Date: Fri, 13 Oct 2017 15:57:17 +0200 Message-Id: <20171013135719.18450-3-petr.vorel@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171013135719.18450-1-petr.vorel@gmail.com> References: <20171013135719.18450-1-petr.vorel@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 959f1428 ("color: add new COLOR_NONE and disable_color function") introducing color enum COLOR_NONE, which is not only duplicite of COLOR_CLEAR, but also caused segfault, when running ip with --color switch, as 'attr + 8' in color_fprintf() access array item out of bounds. Thus removing it and restoring "magic" offset + 7. Reproduce with: $ ip -c a Signed-off-by: Petr Vorel --- include/color.h | 1 - lib/color.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/color.h b/include/color.h index 1cd6f7d2..c183ef79 100644 --- a/include/color.h +++ b/include/color.h @@ -2,7 +2,6 @@ #define __COLOR_H__ 1 enum color_attr { - COLOR_NONE, COLOR_IFNAME, COLOR_MAC, COLOR_INET, diff --git a/lib/color.c b/lib/color.c index 79d5e289..05afcb21 100644 --- a/lib/color.c +++ b/lib/color.c @@ -104,13 +104,13 @@ int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...) va_start(args, fmt); - if (!color_is_enabled || attr == COLOR_NONE) { + if (!color_is_enabled || attr == COLOR_CLEAR) { ret = vfprintf(fp, fmt, args); goto end; } ret += fprintf(fp, "%s", - color_codes[attr_colors[is_dark_bg ? attr + 8 : attr]]); + color_codes[attr_colors[is_dark_bg ? attr + 7 : attr]]); ret += vfprintf(fp, fmt, args); ret += fprintf(fp, "%s", color_codes[C_CLEAR]); From patchwork Fri Oct 13 13:57:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 825484 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="L9C2uqyS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yD8Ry1YKgz9sNr for ; Sat, 14 Oct 2017 00:57:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758236AbdJMN5s (ORCPT ); Fri, 13 Oct 2017 09:57:48 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:55341 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753447AbdJMN5p (ORCPT ); Fri, 13 Oct 2017 09:57:45 -0400 Received: by mail-wm0-f65.google.com with SMTP id u138so22097757wmu.4 for ; Fri, 13 Oct 2017 06:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JZgSCIhpZ+cBreQIPkkEb8H/5RGIyi3A9jxrs8doSpM=; b=L9C2uqyS13gtlgt5E+CYS11s6onMckpBUXly9wLkuavAZg8Dv+9/MCdcfmNbJEvvMu 77xj52AWuEkWLcVhC6Kzcg2rD0U1ZHMm9btwwXkNifDCO8ZtPTkVkjLvIeY20lXbjjIQ AUiTApP6Ale7GtyOtDiBpPUAWcDPZUnHaHtowyaKnG9pfcZXgMu/3jXQ2KMdkdWRXAzN kOZDex9/Dm4ij4HggPGqvGsgKergErRVMW5c7VD6mLlK8MkmYt+0VZYWtwmebXjTItm1 McSy5V2jH5YB7ZkjLkeLEZJH+LqHUacbwocUiImT94tqJo+o0MoAgX2/ztdmcdq2YuKu yh5A== 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=JZgSCIhpZ+cBreQIPkkEb8H/5RGIyi3A9jxrs8doSpM=; b=MZszg5IeWqtYs3+jenwPlb3FGCkh6ntKDc9bMznNWsCBNrMf5fnLlpOpp5likvC1WB 21iHaiEvOWMqWNCk77IT0HUblZpgJQ9fuhRMZU24lNBPyPWeNF5YuXELMOIKaBicPvUC xEQnfNsqSWMLoRL4ceNqR9STQ58cv8llclRe7IizvYbidniFAj0XiH9NYpHd06Zc8b5E IkI/aiHMRMGHrzgqJ7c6GdBnJeVcNGRif+egBHmbLhgBrW0NAoj0YM0mMg7IIJOK+gUb fVcQpLlm+njI+ND3g1a4FXL63nJFoAg3vjvyx8zbszU6zaOU4I9etMVxNiImljxPrQDV Bj2g== X-Gm-Message-State: AMCzsaV4ZMaMrP+/AgMXNfNFX9+DZwsKPAze54mNYXlxGlhK3bv/e+7S JxychgSyeWdhmJGPJRX7xhqiwA== X-Google-Smtp-Source: ABhQp+RUXKf2Xglr+KX+Z7g0ujT+Fw7iYFhZHhl8PF6WivblGFfVNQ/xg3YrjD5/GCMX+cpIWo7+8Q== X-Received: by 10.28.100.212 with SMTP id y203mr1649184wmb.64.1507903064589; Fri, 13 Oct 2017 06:57:44 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id q16sm1414348wrg.96.2017.10.13.06.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Oct 2017 06:57:44 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Julien Fortin , Stephen Hemminger Subject: [PATCH iproute2 v2 3/4] color: Cleanup code to remove "magic" offset + 7 Date: Fri, 13 Oct 2017 15:57:18 +0200 Message-Id: <20171013135719.18450-4-petr.vorel@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171013135719.18450-1-petr.vorel@gmail.com> References: <20171013135719.18450-1-petr.vorel@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Petr Vorel --- lib/color.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/color.c b/lib/color.c index 05afcb21..497f5e1b 100644 --- a/lib/color.c +++ b/lib/color.c @@ -45,8 +45,8 @@ static const char * const color_codes[] = { NULL, }; -static enum color attr_colors[] = { - /* light background */ +/* light background */ +static enum color attr_colors_light[] = { C_CYAN, C_YELLOW, C_MAGENTA, @@ -54,8 +54,10 @@ static enum color attr_colors[] = { C_GREEN, C_RED, C_CLEAR, +}; - /* dark background */ +/* dark background */ +static enum color attr_colors_dark[] = { C_BOLD_CYAN, C_BOLD_YELLOW, C_BOLD_MAGENTA, @@ -109,8 +111,9 @@ int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...) goto end; } - ret += fprintf(fp, "%s", - color_codes[attr_colors[is_dark_bg ? attr + 7 : attr]]); + ret += fprintf(fp, "%s", color_codes[is_dark_bg ? + attr_colors_dark[attr] : attr_colors_light[attr]]); + ret += vfprintf(fp, fmt, args); ret += fprintf(fp, "%s", color_codes[C_CLEAR]); From patchwork Fri Oct 13 13:57:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 825485 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OwN3KUrH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yD8S33hlSz9sNr for ; Sat, 14 Oct 2017 00:57:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758237AbdJMN5w (ORCPT ); Fri, 13 Oct 2017 09:57:52 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:37755 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753447AbdJMN5u (ORCPT ); Fri, 13 Oct 2017 09:57:50 -0400 Received: by mail-wr0-f196.google.com with SMTP id k15so990504wrc.4 for ; Fri, 13 Oct 2017 06:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Jmni194BVNqo6idjXuTtG2Oka9kpvkqwVRNNL0tt6U4=; b=OwN3KUrHvIvrQ3CTOod0DAD+yf8K5L6LSv8BfGha/VV69fO8qMvKkU209BzISEsOmb 3o0chzDYB46ix75UH4+/MjmKQVygWY411A01U1W0yHt4U+kioYaoO/DTc5Sc0+fKcInM fZbZnARNm/jHcdyf6Grr+Wp8l33Y8bdY02OOI/kYgCF4wUwWi5hrW8g4slInCWXwmJas 4trr4LkEZLEojbzDFUP46G60rtpRuYaoYJFF+he6wxG/7Rx656QTmFRXsJfwRQWzazn4 D9QWY36UGAvScEeoMOl/gYdVeMLW6SO5btRCHC8KBEdS7VEwJpeE5U2rEcco+3TI6wxM 8xtw== 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=Jmni194BVNqo6idjXuTtG2Oka9kpvkqwVRNNL0tt6U4=; b=QJicKLpv4aJyTPv2ewdRt03CmwcoswTu9xYj+I0lrO5xPlkJJ94hqg9U4mJlhR7hEs qeh4v9XnWULIoSGGIq7DGZ+iW9dQe1rN4MBAoPYDD7tPtXG5u0Gwo1tJoBfNm0N06VkE +mkxLuUTfwtu7SKbBhZ2amV9IUcLfj5pY1Suws3R595iOkq5jHq6zDu37RMUqOfDibl+ 7o1lVqPKPbw/vrNHQ8aSflpkYGHK8MhaIMuCq7WOU8YEqySYzKhR5Uwn+G9TXYO/v1r4 J3ldq+qpSNMlLz4rkrGfUiJvQKD8ZvETPx5Q64fFrfWHcHlFmkWkHREWWaqW2HWURSpg I5Rw== X-Gm-Message-State: AMCzsaXg8UaCK+CphLnxgtiPrHAl5tdqgaMMSslm4EE4ZltkH7l4gLhx 2ZP6Grw7XmfrtUODcJICpwhOmA== X-Google-Smtp-Source: AOwi7QDiYx8gwNCKhSvNfT00SqkWFRyIbBNlYOS9NpLerVi2qoh63NLb1ce5ygqlhMBp/mNM4kTWgA== X-Received: by 10.223.131.166 with SMTP id 35mr1503979wre.84.1507903068706; Fri, 13 Oct 2017 06:57:48 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id q16sm1414348wrg.96.2017.10.13.06.57.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Oct 2017 06:57:48 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Julien Fortin , Stephen Hemminger Subject: [PATCH iproute2 v2 4/4] color: Rename enum Date: Fri, 13 Oct 2017 15:57:19 +0200 Message-Id: <20171013135719.18450-5-petr.vorel@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171013135719.18450-1-petr.vorel@gmail.com> References: <20171013135719.18450-1-petr.vorel@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org COLOR_NONE is more descriptive than COLOR_CLEAR. Signed-off-by: Petr Vorel --- include/color.h | 2 +- include/json_print.h | 2 +- lib/color.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/color.h b/include/color.h index c183ef79..7fd685d0 100644 --- a/include/color.h +++ b/include/color.h @@ -8,7 +8,7 @@ enum color_attr { COLOR_INET6, COLOR_OPERSTATE_UP, COLOR_OPERSTATE_DOWN, - COLOR_CLEAR + COLOR_NONE }; void enable_color(void); diff --git a/include/json_print.h b/include/json_print.h index 596af35a..dc4d2bb3 100644 --- a/include/json_print.h +++ b/include/json_print.h @@ -53,7 +53,7 @@ void close_json_array(enum output_type type, const char *delim); const char *fmt, \ type value) \ { \ - print_color_##type_name(t, COLOR_CLEAR, key, fmt, value); \ + print_color_##type_name(t, COLOR_NONE, key, fmt, value); \ } _PRINT_FUNC(int, int); _PRINT_FUNC(bool, bool); diff --git a/lib/color.c b/lib/color.c index 497f5e1b..8d049a01 100644 --- a/lib/color.c +++ b/lib/color.c @@ -106,7 +106,7 @@ int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...) va_start(args, fmt); - if (!color_is_enabled || attr == COLOR_CLEAR) { + if (!color_is_enabled || attr == COLOR_NONE) { ret = vfprintf(fp, fmt, args); goto end; } @@ -130,7 +130,7 @@ enum color_attr ifa_family_color(__u8 ifa_family) case AF_INET6: return COLOR_INET6; default: - return COLOR_CLEAR; + return COLOR_NONE; } } @@ -142,6 +142,6 @@ enum color_attr oper_state_color(__u8 state) case IF_OPER_DOWN: return COLOR_OPERSTATE_DOWN; default: - return COLOR_CLEAR; + return COLOR_NONE; } }