From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EFCDC282CE for ; Fri, 12 Apr 2019 23:57:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 404D9218AF for ; Fri, 12 Apr 2019 23:57:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="e8LnnoWA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727011AbfDLX5j (ORCPT ); Fri, 12 Apr 2019 19:57:39 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:42002 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726958AbfDLX5j (ORCPT ); Fri, 12 Apr 2019 19:57:39 -0400 Received: by mail-qt1-f193.google.com with SMTP id p20so13226938qtc.9 for ; Fri, 12 Apr 2019 16:57:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :organization:mime-version:content-transfer-encoding; bh=zy5WW3coDUPdD9PzfYAKQ+RyYpRNumKsgaZNmQrITTQ=; b=e8LnnoWAzZ/pIy5ty+zNtsK04ZxrFd2DEOm3+tvuxwkPp/4iVPF295yxk00pdfEjsU HOVkAAWFJlpESvfxe9809Tm9SdPCWfyWe3gG/XB5jy9Gg/95bdyv0/MWIk7QYTrRVZGU 4qcvWmZz5GYOG4ck1AsicFkxQz2CphG+i3FuLmOC8g7u6thqaBtrixoAADrP83l6Uqhk Kr+U4zPeuUWuahmYDppV9PaSTzaBDI9o3Osv3dW8ZYv7ywjM4v4r44X//U7soummkLIs JBbw+GJPZPkUZxVVexeOpcArd9QuGFZBq6sIcgtNvGWozf3TdDiW990MVcty6e1r+NyP pMmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:organization:mime-version:content-transfer-encoding; bh=zy5WW3coDUPdD9PzfYAKQ+RyYpRNumKsgaZNmQrITTQ=; b=Z1rcPz1z4WaIQyG/DImdxAI1Hrz/rzca6Nz7aGfrPD7VHz24qR2ivFWdlQLE36PHWI BnMZUWV5gT84906h0IrqKKm+7KhWsWLoV1oX2RFQA2iKwQ9FF2TJuZNBO5XEevCAdGpa /YcUKVZB5QBiKfoS4q1X4zT7IWwf4+wTsKdT0gAMncwz15SQCQ3OaYxlVVP0JuhLzCnY rf7VXUbTe5NdNDIrEKwdmUjdkwY7w00TGYgIyrcBByKretbFyhmt00X/0ejnOrigrwWB NDjblq6RdPbAA+pXQ39hXs7N/tZEuKQ9HICut/98h4UOwGkrDxKppoD42ToBhD/qmWBm dq2w== X-Gm-Message-State: APjAAAUe22vSR/G5YO2aRr2/hCWlKqGq2eCtoIvCs8ztqCbjgf8Ezo9D HR9J15eLXK2XAu/xEI4GInARs3QcZRg= X-Google-Smtp-Source: APXvYqzzrpkPvBLcIxEESYXbDEmSepGGzt60Pr2X+cS/9um5EbeC//3yAk425WBdij6+mJROb3B54g== X-Received: by 2002:a0c:949c:: with SMTP id j28mr50059369qvj.18.1555113458198; Fri, 12 Apr 2019 16:57:38 -0700 (PDT) Received: from cakuba.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id s41sm22591662qta.72.2019.04.12.16.57.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Apr 2019 16:57:38 -0700 (PDT) Date: Fri, 12 Apr 2019 16:57:34 -0700 From: Jakub Kicinski To: Benjamin Poirier Cc: Daniel Borkmann , netdev@vger.kernel.org, bpf@vger.kernel.org, David Ahern Subject: Re: [PATCH v2 bpf-next 1/2] bpftool: Use print_entry_error() in case of ENOENT when dumping Message-ID: <20190412165725.6ad21acb@cakuba.netronome.com> In-Reply-To: <20190412030322.15494-1-bpoirier@suse.com> References: <20190411082700.26888-1-bpoirier@suse.com> <20190412030322.15494-1-bpoirier@suse.com> Organization: Netronome Systems, Ltd. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, 12 Apr 2019 12:03:21 +0900, Benjamin Poirier wrote: > diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c > index e96903078991..71840faaeab5 100644 > --- a/tools/bpf/bpftool/map.c > +++ b/tools/bpf/bpftool/map.c > @@ -261,20 +261,19 @@ static void print_entry_json(struct bpf_map_info *info, unsigned char *key, > } > > static void print_entry_error(struct bpf_map_info *info, unsigned char *key, > - const char *value) > + const char *value, bool single_line) > { > - int value_size = strlen(value); > - bool single_line, break_names; > + bool break_names; I'd rather you kept the strlen() and 16 char limitation logic. > - break_names = info->key_size > 16 || value_size > 16; > - single_line = info->key_size + value_size <= 24 && !break_names; > + break_names = info->key_size > 16; > + single_line = single_line && !break_names; > > printf("key:%c", break_names ? '\n' : ' '); > fprint_hex(stdout, key, info->key_size, " "); > > printf(single_line ? " " : "\n"); > > - printf("value:%c%s", break_names ? '\n' : ' ', value); > + printf("value:%c%s", single_line ? ' ' : '\n', value); > > printf("\n"); > }