From patchwork Mon Nov 5 19:20:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10669007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 124001923 for ; Mon, 5 Nov 2018 19:21:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0315D29C11 for ; Mon, 5 Nov 2018 19:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB7A029C73; Mon, 5 Nov 2018 19:21:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B34A29C11 for ; Mon, 5 Nov 2018 19:21:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387977AbeKFEmX (ORCPT ); Mon, 5 Nov 2018 23:42:23 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:35406 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387556AbeKFEmX (ORCPT ); Mon, 5 Nov 2018 23:42:23 -0500 Received: by mail-lj1-f193.google.com with SMTP id x85-v6so9145938ljb.2 for ; Mon, 05 Nov 2018 11:21:13 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=dvg8Z+FQnMXcOmkITbXP+xdOyJ+7C+d3npGAZtsVRp4=; b=gR46Cc/gUu7+d0409H+I8JSSuK8usagjMACnR2/Dp4DHysaRmnWlIkA6ia54Ojk+C9 0ksZoqiozDMbzud+qfJcoLFyCXIO4zIety8xEAevhEo7CKUx4Jm8mn8JVAOAkQzhTzqm NRaq9xwk3tu+DcYVEQhrOVy/kAvO1repP+3r5gye6KPtFVOO2bHGmiCZaIgOpmjVuLsE HpxXeUAzOpKZZKybHCP6WL7c5nJ2zPMIIrqxVCcKv9tRNPomfpjwBxvSARMubg1jlCxA /wKS14rnLxc9ASDkvPqY7YRxs6pnB1M3bZqbOvbHXdn3mBz+FGoxeWC7+2gcsL6wOW25 YSuA== 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:mime-version:content-transfer-encoding; bh=dvg8Z+FQnMXcOmkITbXP+xdOyJ+7C+d3npGAZtsVRp4=; b=KBw7fNoMv9mNkzwbc1gHRx3dcYdl64P9piWAzCvTmQXuquiXJTcZq3Z3v2xnNVriSV OT4c74WxPDbBdH6hXm8Qe1mdBPCSXVfXnuNuXmVGYifLwQN9qWpyQyuVzDKaP/BcjGKq tvApxxnhA6LS9jAP3p8UiGSZJ+0qVffVOHbJMDJ57MgqDNW42DdpaBVYNEt92EXISnmI UbCLW8iKLVp+H7VWr7hfhLaq4zE+WmT/2c7l+t4ZOD9BKEAUfgnpCvO3H3iyQdx08B8w UvqXG6dBF/0yoJr6g7wV2fF45AST8d/E8/Y9t8F5OGoC358YpR6Tg+kPNyHBzZRbkots +ZSw== X-Gm-Message-State: AGRZ1gIyrqRy0zaEYh0duKZIrTa9bgUwRni6q7Go7qiiL3RZ7MVfh6PT xFAykdwdD+54yd0qzSIJ3Z0= X-Google-Smtp-Source: AJdET5cf1BucEI4YYdwXAQV2urS0kZZMI6ue/acDKuQnasv+Zv0GEnAEZFRadtKWXMhvpNNsvu+HjA== X-Received: by 2002:a2e:9d50:: with SMTP id y16-v6mr16483902ljj.136.1541445672183; Mon, 05 Nov 2018 11:21:12 -0800 (PST) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id x5-v6sm3591056lfe.58.2018.11.05.11.21.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 11:21:11 -0800 (PST) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: git@vger.kernel.org, Junio C Hamano , =?utf-8?q?SZEDE?= =?utf-8?q?R_G=C3=A1bor?= Subject: [PATCH v2 05/16] read-cache.c: turn die("internal error") to BUG() Date: Mon, 5 Nov 2018 20:20:48 +0100 Message-Id: <20181105192059.20303-6-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.1005.gac84295441 In-Reply-To: <20181105192059.20303-1-pclouds@gmail.com> References: <20181028065157.26727-1-pclouds@gmail.com> <20181105192059.20303-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Nguyễn Thái Ngọc Duy --- read-cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/read-cache.c b/read-cache.c index d57958233e..0c37f4885e 100644 --- a/read-cache.c +++ b/read-cache.c @@ -316,7 +316,7 @@ static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st) changed |= DATA_CHANGED; return changed; default: - die("internal error: ce_mode is %o", ce->ce_mode); + BUG("unsupported ce_mode: %o", ce->ce_mode); } changed |= match_stat_data(&ce->ce_stat_data, st); @@ -2356,14 +2356,14 @@ void validate_cache_entries(const struct index_state *istate) for (i = 0; i < istate->cache_nr; i++) { if (!istate) { - die("internal error: cache entry is not allocated from expected memory pool"); + BUG("cache entry is not allocated from expected memory pool"); } else if (!istate->ce_mem_pool || !mem_pool_contains(istate->ce_mem_pool, istate->cache[i])) { if (!istate->split_index || !istate->split_index->base || !istate->split_index->base->ce_mem_pool || !mem_pool_contains(istate->split_index->base->ce_mem_pool, istate->cache[i])) { - die("internal error: cache entry is not allocated from expected memory pool"); + BUG("cache entry is not allocated from expected memory pool"); } } }