From patchwork Thu Aug 17 17:35:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Fortin X-Patchwork-Id: 802788 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="CvMPvjjw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xYD4w7205z9t4X for ; Fri, 18 Aug 2017 03:40:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753391AbdHQRkO (ORCPT ); Thu, 17 Aug 2017 13:40:14 -0400 Received: from mail-wr0-f178.google.com ([209.85.128.178]:32987 "EHLO mail-wr0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752664AbdHQRkN (ORCPT ); Thu, 17 Aug 2017 13:40:13 -0400 Received: by mail-wr0-f178.google.com with SMTP id b65so50104860wrd.0 for ; Thu, 17 Aug 2017 10:40:12 -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=+KhBVHhLTyAX9rMmZJvOwYAjRqrbrE/eyUwZ6+QvJT8=; b=CvMPvjjwgq3Miekd6ehopvj/B2z/K+ycQvhmJOHS97Dqd5Eo5tOz97CP2iA1TeAcq0 FX2cZEYNc0nYp0RayJiLxVWcL8StG2lZQODPC/WESgEisrciQ/dK2Vo1R4QreNtVkh9j PyejSHv/ssZPvFq9tJnSrhacG8d+BNTc3FWiM= 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=+KhBVHhLTyAX9rMmZJvOwYAjRqrbrE/eyUwZ6+QvJT8=; b=j+3DJZwXCNQrvQL1EXByHombycwXnLKNM5UGYn7+vj2gLa9RANohCJf+XLIwIb3+by JHKoYxyx7TPNz4N79Dx2tLnmIQslzaribVYyDQ22LF36+a3Oiw/rgl9Mk6JOhbm0nm66 Lxm6CLkqkd7v5mMfcvEoCqDUPlw8WRJtu9qsTfG9kY3F6ZXOwinD2fa95uJw+lA+WRb1 xfEHmMx/Khti6rDV/8EfiQk9BRc1B92plhGKdac2F5+X6qY/yDtyAUgLKBmyet3IuZKF LDK+WpnRR5v9OuD4IJCG+4sX+TyiDwAvpVHxn40a9S7Q5gOF8RZzU/OKtMVAOK0d5uRE l9MA== X-Gm-Message-State: AHYfb5i+M44dkn8Pdd+vhg3wtffI/zXLM9fLJo+R/BAFC6QPcp0mHO7j m5fwEI9uDAaqJTDc/xcJ3Io5 X-Received: by 10.28.132.81 with SMTP id g78mr178870wmd.158.1502991611629; Thu, 17 Aug 2017 10:40:11 -0700 (PDT) Received: from localhost.localdomain ([37.169.21.172]) by smtp.googlemail.com with ESMTPSA id k13sm3902040wrd.4.2017.08.17.10.39.37 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 Aug 2017 10:40:11 -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 iproute2 json v2 01/27] color: add new COLOR_NONE and disable_color function Date: Thu, 17 Aug 2017 10:35:48 -0700 Message-Id: <20170817173614.54987-2-julien@cumulusnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170817173614.54987-1-julien@cumulusnetworks.com> References: <20170817173614.54987-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 | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/color.h b/include/color.h index ba0b237e..1cd6f7d2 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 check_if_color_enabled(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..79d5e289 100644 --- a/lib/color.c +++ b/lib/color.c @@ -89,6 +89,14 @@ void set_color_palette(void) is_dark_bg = 1; } +void check_if_color_enabled(void) +{ + if (color_is_enabled) { + fprintf(stderr, "Option \"-json\" conflicts with \"-color\".\n"); + exit(1); + } +} + int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...) { int ret = 0; @@ -96,13 +104,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]);