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; } }