From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jared Hance Subject: [PATCH 1/3] Use startup_info->prefix rather than prefix. Date: Fri, 2 Mar 2012 21:31:13 -0500 Message-ID: References: Cc: Jared Hance To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Mar 03 03:31:48 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1S3elA-0000AS-0Z for gcvg-git-2@plane.gmane.org; Sat, 03 Mar 2012 03:31:48 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751203Ab2CCCbe (ORCPT ); Fri, 2 Mar 2012 21:31:34 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:43617 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750771Ab2CCCbd (ORCPT ); Fri, 2 Mar 2012 21:31:33 -0500 Received: by mail-iy0-f174.google.com with SMTP id z16so3102984iag.19 for ; Fri, 02 Mar 2012 18:31:33 -0800 (PST) Received-SPF: pass (google.com: domain of jaredhance@gmail.com designates 10.42.62.205 as permitted sender) client-ip=10.42.62.205; Authentication-Results: mr.google.com; spf=pass (google.com: domain of jaredhance@gmail.com designates 10.42.62.205 as permitted sender) smtp.mail=jaredhance@gmail.com; dkim=pass header.i=jaredhance@gmail.com Received: from mr.google.com ([10.42.62.205]) by 10.42.62.205 with SMTP id z13mr6110409ich.34.1330741893505 (num_hops = 1); Fri, 02 Mar 2012 18:31:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=v3AwOy9tQ2D4kguX95e2w97RKdm43MMtToBV8NpJa8U=; b=HGvSbZo5h8S4KwpWtyFa2I2wpSOX0M1g7+e6xJ8I5mF8rbTDqlK7TccGUeKxZ6wY8h hv7Es8Y/1ra/VWxGQrXowXClVRQMrVYDnRI6ApnZGFAIJhu4vXcJRfgpin0wD88ZbaWO 40YGp4Ot3h7CkegCS/PrlRBZDALa9X81D+FzSQKzxMODclWr5jWYasE2eoYwTPsPWtJC 5Ur4e0UUYEvY2Kxc+acKPqA1dHYgq3R37/4x16kNN0QLxhWDyaHROzrwUldyZWcfN6tp 7RlHkOWnFPAYywbfie2651Ywh9w+lzFXRRGh9Cj5jFpknGyAhCAIYnbCLayMPhV4FLf4 1BRA== Received: by 10.42.62.205 with SMTP id z13mr5031420ich.34.1330741893432; Fri, 02 Mar 2012 18:31:33 -0800 (PST) Received: from localhost.localdomain (cpe-174-101-220-163.cinci.res.rr.com. [174.101.220.163]) by mx.google.com with ESMTPS id v3sm2578583igw.6.2012.03.02.18.31.32 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Mar 2012 18:31:32 -0800 (PST) X-Mailer: git-send-email 1.7.3.4 In-Reply-To: In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: In trace_repo_setup, prefix is passed in as startup_info->prefix. But, as indicated but a FIXME comment, trace_repo_setup has access to startup_info. The prefix parameter has therefor been eliminated. Signed-off-by: Jared Hance --- cache.h | 2 +- git.c | 2 +- trace.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cache.h b/cache.h index e12b15f..baa8852 100644 --- a/cache.h +++ b/cache.h @@ -1211,7 +1211,7 @@ extern void trace_printf(const char *format, ...); extern void trace_vprintf(const char *key, const char *format, va_list ap); __attribute__((format (printf, 2, 3))) extern void trace_argv_printf(const char **argv, const char *format, ...); -extern void trace_repo_setup(const char *prefix); +extern void trace_repo_setup(void); extern int trace_want(const char *key); extern void trace_strbuf(const char *key, const struct strbuf *buf); diff --git a/git.c b/git.c index 3805616..7dcc527 100644 --- a/git.c +++ b/git.c @@ -296,7 +296,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) if ((p->option & (RUN_SETUP | RUN_SETUP_GENTLY)) && startup_info->have_repository) /* get_git_dir() may set up repo, avoid that */ - trace_repo_setup(prefix); + trace_repo_setup(); } commit_pager_choice(); diff --git a/trace.c b/trace.c index d953416..ebacf24 100644 --- a/trace.c +++ b/trace.c @@ -152,8 +152,7 @@ static const char *quote_crnl(const char *path) return new_path; } -/* FIXME: move prefix to startup_info struct and get rid of this arg */ -void trace_repo_setup(const char *prefix) +void trace_repo_setup(void) { static const char *key = "GIT_TRACE_SETUP"; const char *git_work_tree; @@ -168,13 +167,14 @@ void trace_repo_setup(const char *prefix) if (!(git_work_tree = get_git_work_tree())) git_work_tree = "(null)"; - if (!prefix) - prefix = "(null)"; + if (!startup_info->prefix) + startup_info->prefix = "(null)"; trace_printf_key(key, "setup: git_dir: %s\n", quote_crnl(get_git_dir())); trace_printf_key(key, "setup: worktree: %s\n", quote_crnl(git_work_tree)); trace_printf_key(key, "setup: cwd: %s\n", quote_crnl(cwd)); - trace_printf_key(key, "setup: prefix: %s\n", quote_crnl(prefix)); + trace_printf_key(key, "setup: prefix: %s\n", + quote_crnl(startup_info->prefix)); } int trace_want(const char *key) -- 1.7.3.4