From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 55EC11F859 for ; Wed, 7 Sep 2016 23:37:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752107AbcIGXhE (ORCPT ); Wed, 7 Sep 2016 19:37:04 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35011 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752046AbcIGXhB (ORCPT ); Wed, 7 Sep 2016 19:37:01 -0400 Received: by mail-pa0-f43.google.com with SMTP id b2so10824975pat.2 for ; Wed, 07 Sep 2016 16:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DPr2yQQobqfsuLJTOUxuZ7seicoq00gVx7gKjEu8Clk=; b=pftsRCe2JRL/R5HS/dxn5opOdgf6FvNR3oKoyymzVLE67oi7EQk1SF+V+i4yLNDKy0 hHE9s0orBUaK0kaHkXFa3Nn6kLgClt1gEY4vkHbxcbXIytWpJx9nVbQ/E2O9TceidXXV vZlvX3/KJovXjO886kMnYueAwYNrVMFm9NzgO8inWMb/amhIrbISz7jahXBY7dlAInER 0thX2vTE4rE4lCiPb/MdwA9HpFBd6IAGBmJbSfSU2KGlc4YuS0+pvxcVSArMHcRnY3TE WrvVsiUurqoCwa4/XirJgRfzXLPZFQg0aeHTIPXFYviu+Vtlv9JIdhfS8XXI18AeADV4 +ufw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DPr2yQQobqfsuLJTOUxuZ7seicoq00gVx7gKjEu8Clk=; b=CXM6XLNgmGcBUowc9g365zzeWbUbFHuVCKlq+8EEDwW/l2J+34qWnel9phKcRAnw5+ pYIFJ26Ew0nkts2g6ECtOGfYkisfBBs63bIHjnx2wBuWWzOMQfaPIWgSFX/cJfbSNXOf GtxNHj8vVOHDn0eXWiELEiFdVkorAoOtfVrY2IqvICZstB+EYcexQaxDNJ6dIlA0ybWk YMnlOPKe1bM+zdfEXwmhQaTwqvAwnOp6MSahn0mOjaY+mk8VRQ178SSTjcU77Yoat9KA jKqEsdkZruTP8Nh8e9s4FvKYxSBFy2Xy1vOexlo945NTrFu28A9HVPvotIZSxotdSMlo oIcw== X-Gm-Message-State: AE9vXwO5AV+lvPihKXqwNoHRgZwK6LQUhWGv/S0bok6L3xyYpEsGJVgO8pEyEeQSqr68hUiI X-Received: by 10.66.191.2 with SMTP id gu2mr50996230pac.149.1473291420042; Wed, 07 Sep 2016 16:37:00 -0700 (PDT) Received: from localhost ([2620:0:1000:5b10:f111:face:c1e2:bcdc]) by smtp.gmail.com with ESMTPSA id 18sm6942436pft.10.2016.09.07.16.36.59 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 07 Sep 2016 16:36:59 -0700 (PDT) From: Stefan Beller To: gitster@pobox.com Cc: git@vger.kernel.org, Stefan Beller Subject: [PATCH 2/2] diff: remove dead code Date: Wed, 7 Sep 2016 16:36:47 -0700 Message-Id: <20160907233648.5162-5-sbeller@google.com> X-Mailer: git-send-email 2.10.0.2.g0676c79.dirty In-Reply-To: <20160907233648.5162-1-sbeller@google.com> References: <20160907233648.5162-1-sbeller@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When `len < 1`, len has to be 0 or negative, emit_line will then remove the first character and by then `len` would be negative. As this doesn't happen, it is safe to assume it is dead code. This continues to simplify the code, which was started in b8d9c1a66b (2009-09-03, diff.c: the builtin_diff() deals with only two-file comparison). Signed-off-by: Stefan Beller --- diff.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/diff.c b/diff.c index 79ad91d..c143019 100644 --- a/diff.c +++ b/diff.c @@ -1251,14 +1251,6 @@ static void fn_out_consume(void *priv, char *line, unsigned long len) return; } - if (len < 1) { - emit_line(o, reset, reset, line, len); - if (ecbdata->diff_words - && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) - fputs("~\n", o->file); - return; - } - if (ecbdata->diff_words) { if (line[0] == '-') { diff_words_append(line, len, -- 2.10.0.2.g0676c79.dirty