From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH 4/6] Add "const" qualifier to "char *editor_program". Date: Sat, 16 Feb 2008 06:01:41 +0100 Message-ID: <20080216060141.53c0634b.chriscool@tuxfamily.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Junio Hamano , Pierre Habouzit , Martin Koegler , Johannes Sixt To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Feb 16 05:56:30 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JQF6D-000471-JQ for gcvg-git-2@gmane.org; Sat, 16 Feb 2008 05:56:30 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754736AbYBPEzp (ORCPT ); Fri, 15 Feb 2008 23:55:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754688AbYBPEzp (ORCPT ); Fri, 15 Feb 2008 23:55:45 -0500 Received: from smtp1-g19.free.fr ([212.27.42.27]:34823 "EHLO smtp1-g19.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754613AbYBPEzp (ORCPT ); Fri, 15 Feb 2008 23:55:45 -0500 Received: from smtp1-g19.free.fr (localhost.localdomain [127.0.0.1]) by smtp1-g19.free.fr (Postfix) with ESMTP id 2FF9B1AB2AA; Sat, 16 Feb 2008 05:55:44 +0100 (CET) Received: from localhost.boubyland (gre92-7-82-243-130-161.fbx.proxad.net [82.243.130.161]) by smtp1-g19.free.fr (Postfix) with SMTP id D36E81AB2A9; Sat, 16 Feb 2008 05:55:43 +0100 (CET) X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; i486-pc-linux-gnu) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Also use "git_config_string" to simplify "config.c" code where "editor_program" is set. Signed-off-by: Christian Couder --- cache.h | 2 +- config.c | 8 ++------ environment.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cache.h b/cache.h index 892f374..2af1468 100644 --- a/cache.h +++ b/cache.h @@ -655,7 +655,7 @@ extern const char *pager_program; extern int pager_in_use(void); extern int pager_use_color; -extern char *editor_program; +extern const char *editor_program; extern char *excludes_file; /* base85 */ diff --git a/config.c b/config.c index 01e3843..07027de 100644 --- a/config.c +++ b/config.c @@ -443,12 +443,8 @@ int git_default_config(const char *var, const char *value) if (!strcmp(var, "core.pager")) return git_config_string(&pager_program, var, value); - if (!strcmp(var, "core.editor")) { - if (!value) - return config_error_nonbool(var); - editor_program = xstrdup(value); - return 0; - } + if (!strcmp(var, "core.editor")) + return git_config_string(&editor_program, var, value); if (!strcmp(var, "core.excludesfile")) { if (!value) diff --git a/environment.c b/environment.c index b8869e9..9556009 100644 --- a/environment.c +++ b/environment.c @@ -32,7 +32,7 @@ size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT; size_t delta_base_cache_limit = 16 * 1024 * 1024; const char *pager_program; int pager_use_color = 1; -char *editor_program; +const char *editor_program; char *excludes_file; int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */ unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; -- 1.5.4.1.129.gf12af-dirty