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=-1.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD,UNWANTED_LANGUAGE_BODY shortcircuit=no autolearn=no 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 227F820188 for ; Sun, 14 May 2017 03:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758310AbdENDQN (ORCPT ); Sat, 13 May 2017 23:16:13 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:33442 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757197AbdENDQK (ORCPT ); Sat, 13 May 2017 23:16:10 -0400 Received: by mail-oi0-f68.google.com with SMTP id h4so14343915oib.0 for ; Sat, 13 May 2017 20:16:09 -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=GnzlXiT7yNhX8XnPrv/tpqzkFn7oVMpi9eMFEkBSXiE=; b=hLLtIgdq0+dJPtR8c+e6GqgxSw0id2lWX9/qhtJDeiNIwBw/VwCLQ9qgSWf8WT6HNz KJ9AyjsZO1igNNH9AOhfojHWSDM7q00I4NGARIzYAciGiX5gZZw4x3MERwlPJvaaR/hL 6d9CKbVq09CV55/rhfQNEzL/NA9P1kMciAILwhYEX/Isy22WEF05rNB0AJBVYBpjMe0l j9GMEu3sHTDHlFmYtMv1yRnpv8izUTvcm1cg5TmFyZ3AMpQkFGo6zGyhyCs4LWOI9FPE 19wnFFIj9EtI1g8k/dhrMzgMbh0MIqAI5FDFIBquguWV4BT+f2uxB77Hecc/gfK7YmbD fUxA== 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=GnzlXiT7yNhX8XnPrv/tpqzkFn7oVMpi9eMFEkBSXiE=; b=QvWnOSU+c+goztcQN5+qARUQrD/B0qznq+dweoUvtvFPjUMvhool2Kq/euXDOLWQHZ 2Kh65wcjWOCmv4/SNdtyYHxYvOPd8oQfOzp1H5hIC97Lx4+3QTPG3ga7zUAnKEBZ2/VI ToDIQOF2OF5V8QASuttsb3DpKLSaBoFnGCWUx1Fk5rnRPE+IfmgjWJRoAFrUTp0cmXMG HFLipxgtl3hsulqqm1/Fz1RRMJ5IpieTOgJbQVxLeMT+ro26hfZxFTsbZIvvR1rBGl+H CWbUxkyCGdlvw8rsawcQ0LRcwpb+VWODqTL0mmSDe98NlSlDe3loELNloTNhaI/CGPFB W4sg== X-Gm-Message-State: AODbwcCCSod0weY3NQapTEXmmGdclAQN1lwLSAN3QkxmG4KcUclY2qop BzNRL/XD7hS5zQ== X-Received: by 10.202.81.9 with SMTP id f9mr4946496oib.184.1494731769318; Sat, 13 May 2017 20:16:09 -0700 (PDT) Received: from whydoubt.T-mobile.com (ip68-12-240-88.ok.ok.cox.net. [68.12.240.88]) by smtp.gmail.com with ESMTPSA id 67sm3735193otb.53.2017.05.13.20.16.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 May 2017 20:16:08 -0700 (PDT) From: Jeff Smith To: git@vger.kernel.org Cc: gitster@pobox.com, peff@peff.net, Jeff Smith Subject: [RFC PATCH v2 03/22] blame: remove unused parameters Date: Sat, 13 May 2017 22:14:54 -0500 Message-Id: <20170514031513.9042-4-whydoubt@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170514031513.9042-1-whydoubt@gmail.com> References: <20170505052729.7576-1-whydoubt@gmail.com> <20170514031513.9042-1-whydoubt@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Clean up blame code before moving it into libgit Signed-off-by: Jeff Smith --- builtin/blame.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index c419981..e30b3ef 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -449,9 +449,7 @@ static struct origin *make_origin(struct commit *commit, const char *path) * Locate an existing origin or create a new one. * This moves the origin to front position in the commit util list. */ -static struct origin *get_origin(struct scoreboard *sb, - struct commit *commit, - const char *path) +static struct origin *get_origin(struct commit *commit, const char *path) { struct origin *o, *l; @@ -499,8 +497,7 @@ static int fill_blob_sha1_and_mode(struct origin *origin) * We have an origin -- check if the same path exists in the * parent and return an origin structure to represent it. */ -static struct origin *find_origin(struct scoreboard *sb, - struct commit *parent, +static struct origin *find_origin(struct commit *parent, struct origin *origin) { struct origin *porigin; @@ -543,7 +540,7 @@ static struct origin *find_origin(struct scoreboard *sb, if (!diff_queued_diff.nr) { /* The path is the same as parent */ - porigin = get_origin(sb, parent, origin->path); + porigin = get_origin(parent, origin->path); oidcpy(&porigin->blob_oid, &origin->blob_oid); porigin->mode = origin->mode; } else { @@ -569,7 +566,7 @@ static struct origin *find_origin(struct scoreboard *sb, die("internal error in blame::find_origin (%c)", p->status); case 'M': - porigin = get_origin(sb, parent, origin->path); + porigin = get_origin(parent, origin->path); oidcpy(&porigin->blob_oid, &p->one->oid); porigin->mode = p->one->mode; break; @@ -588,8 +585,7 @@ static struct origin *find_origin(struct scoreboard *sb, * We have an origin -- find the path that corresponds to it in its * parent and return an origin structure to represent it. */ -static struct origin *find_rename(struct scoreboard *sb, - struct commit *parent, +static struct origin *find_rename(struct commit *parent, struct origin *origin) { struct origin *porigin = NULL; @@ -615,7 +611,7 @@ static struct origin *find_rename(struct scoreboard *sb, struct diff_filepair *p = diff_queued_diff.queue[i]; if ((p->status == 'R' || p->status == 'C') && !strcmp(p->two->path, origin->path)) { - porigin = get_origin(sb, parent, p->one->path); + porigin = get_origin(parent, p->one->path); oidcpy(&porigin->blob_oid, &p->one->oid); porigin->mode = p->one->mode; break; @@ -1270,7 +1266,7 @@ static void find_copy_in_parent(struct scoreboard *sb, /* find_move already dealt with this path */ continue; - norigin = get_origin(sb, parent, p->one->path); + norigin = get_origin(parent, p->one->path); oidcpy(&norigin->blob_oid, &p->one->oid); norigin->mode = p->one->mode; fill_origin_blob(&sb->revs->diffopt, norigin, &file_p); @@ -1404,8 +1400,7 @@ static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt) * common cases, then we look for renames in the second pass. */ for (pass = 0; pass < 2 - no_whole_file_rename; pass++) { - struct origin *(*find)(struct scoreboard *, - struct commit *, struct origin *); + struct origin *(*find)(struct commit *, struct origin *); find = pass ? find_rename : find_origin; for (i = 0, sg = first_scapegoat(revs, commit); @@ -1418,7 +1413,7 @@ static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt) continue; if (parse_commit(p)) continue; - porigin = find(sb, p, origin); + porigin = find(p, origin); if (!porigin) continue; if (!oidcmp(&porigin->blob_oid, &origin->blob_oid)) { @@ -2806,7 +2801,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) sb.final_buf_size = o->file.size; } else { - o = get_origin(&sb, sb.final, path); + o = get_origin(sb.final, path); if (fill_blob_sha1_and_mode(o)) die(_("no such path %s in %s"), path, final_commit_name); -- 2.9.3