From patchwork Thu Aug 3 15:54:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Fortin X-Patchwork-Id: 797268 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 (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="XEjxOuwC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xNZQg5Qmqz9s7C for ; Fri, 4 Aug 2017 01:55:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751600AbdHCPzh (ORCPT ); Thu, 3 Aug 2017 11:55:37 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:37487 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751158AbdHCPzg (ORCPT ); Thu, 3 Aug 2017 11:55:36 -0400 Received: by mail-wm0-f48.google.com with SMTP id t201so19235396wmt.0 for ; Thu, 03 Aug 2017 08:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zcKKkKjg9NP63LAjUbJACxHkmTUQ7XwbspLrsxHz4yI=; b=XEjxOuwCBbY9ZMWA6/uwRUKbLN8JPMZFg0p0pxAvZ4+n40tb3mRAiP1BX3w3ch3WRs yMTlOY8p66MnPh1TPvRmSvDKqRg0No9ppQs4KWENZ51IfyG37ZXwYSV15oG4ZqcDehvw 6ygtVN+pnARCMFZ1oZwwVjobyBzew9MRVy5UM= 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=zcKKkKjg9NP63LAjUbJACxHkmTUQ7XwbspLrsxHz4yI=; b=FiufdiNV6F6MXttE8uE+QIw0gJHp2XTaqO2cznzxvD9RLO64kOJNrWuonn19Aw5l3o o0MzgdmUlMrHL8nad/FN8tsnn+/tILZLplP3nO2zEFanIIPQbJPk9MYLkvIcSwCx1t8D 34M+5Ddq8Rf446MCFF2MxjIUYY3QaPrL938u++1GyYP1l/fqWl9cnZnpRPDqIcYvRQXa /5SoevhhO5UnVA2xvMD+a+1x4Etf/IZByXpfwUNjzHHc0KNeQvWrFcNo7gT5YRM3kWXB hcAgHTda1uLuCpf3B5OgIFWGdcSohLTi+G9glbImyxb2WB8yIlKqk91jwTPJmwktXdhe 0rSg== X-Gm-Message-State: AIVw110ZbPCuMynKAeDrVDOWIDfuZn1zhGlyYAJYb9t4v1VZ5Q5SuwWa owns/EGnYlWVKLU4LLQ= X-Received: by 10.28.163.198 with SMTP id m189mr1413194wme.154.1501775734493; Thu, 03 Aug 2017 08:55:34 -0700 (PDT) Received: from localhost.localdomain (91-160-18-219.subs.proxad.net. [91.160.18.219]) by smtp.googlemail.com with ESMTPSA id d91sm2213309wma.23.2017.08.03.08.55.33 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 03 Aug 2017 08:55:34 -0700 (PDT) From: Julien Fortin X-Google-Original-From: Julien Fortin To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com, dsa@cumulusnetworks.com, Julien Fortin Subject: [PATCH 01/27] color: add new COLOR_NONE and disable_color function Date: Thu, 3 Aug 2017 17:54:49 +0200 Message-Id: <20170803155515.99226-2-julien@cumulusnetworks.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170803155515.99226-1-julien@cumulusnetworks.com> References: <20170803155515.99226-1-julien@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Julien Fortin Signed-off-by: Julien Fortin --- include/color.h | 2 ++ lib/color.c | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/color.h b/include/color.h index ba0b237e..a4ca1177 100644 --- a/include/color.h +++ b/include/color.h @@ -2,6 +2,7 @@ #define __COLOR_H__ 1 enum color_attr { + COLOR_NONE, COLOR_IFNAME, COLOR_MAC, COLOR_INET, @@ -12,6 +13,7 @@ enum color_attr { }; void enable_color(void); +void disable_color(void); 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); diff --git a/lib/color.c b/lib/color.c index 4e947500..2d1db194 100644 --- a/lib/color.c +++ b/lib/color.c @@ -89,6 +89,11 @@ void set_color_palette(void) is_dark_bg = 1; } +void disable_color(void) +{ + color_is_enabled = 0; +} + int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...) { int ret = 0; @@ -96,13 +101,13 @@ int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...) va_start(args, fmt); - if (!color_is_enabled) { + if (!color_is_enabled || attr == COLOR_NONE) { ret = vfprintf(fp, fmt, args); goto end; } ret += fprintf(fp, "%s", - color_codes[attr_colors[is_dark_bg ? attr + 7 : attr]]); + color_codes[attr_colors[is_dark_bg ? attr + 8 : attr]]); ret += vfprintf(fp, fmt, args); ret += fprintf(fp, "%s", color_codes[C_CLEAR]);