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]);