From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Voigt Subject: [PATCH 3/4] config: make parsing stack struct independent from actual data source Date: Tue, 26 Feb 2013 20:42:03 +0100 Message-ID: <20130226194203.GD22756@sandbox-ub> References: <6c69068b4e6a72a2cca5dc6eaffa9982032a7f2a.1361751905.git.hvoigt@hvoigt.net> <7v4nh13plo.fsf@alter.siamese.dyndns.org> <20130226193050.GA22756@sandbox-ub> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Jens Lehmann , Jeff King To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Feb 26 20:42:42 2013 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 1UAQQB-0003qF-4x for gcvg-git-2@plane.gmane.org; Tue, 26 Feb 2013 20:42:39 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757815Ab3BZTmN (ORCPT ); Tue, 26 Feb 2013 14:42:13 -0500 Received: from smtprelay05.ispgateway.de ([80.67.31.97]:40619 "EHLO smtprelay05.ispgateway.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757750Ab3BZTmM (ORCPT ); Tue, 26 Feb 2013 14:42:12 -0500 Received: from [77.21.76.82] (helo=localhost) by smtprelay05.ispgateway.de with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1UAQPc-0000nO-91; Tue, 26 Feb 2013 20:42:04 +0100 Content-Disposition: inline In-Reply-To: <20130226193050.GA22756@sandbox-ub> User-Agent: Mutt/1.5.21 (2010-09-15) X-Df-Sender: aHZvaWd0QGh2b2lndC5uZXQ= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: To simplify adding other sources we extract all functions needed for parsing into a list of callbacks. We implement those callbacks for the current file parsing. A new source can implement its own set of callbacks. Instead of storing the concrete FILE pointer for parsing we store a void pointer. A new source can use this to store its custom data. Signed-off-by: Heiko Voigt --- config.c | 57 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/config.c b/config.c index f55c43d..19aa205 100644 --- a/config.c +++ b/config.c @@ -10,20 +10,42 @@ #include "strbuf.h" #include "quote.h" -typedef struct config_file { - struct config_file *prev; - FILE *f; +struct config { + struct config *prev; + void *data; const char *name; int linenr; int eof; struct strbuf value; struct strbuf var; -} config_file; -static config_file *cf; + int (*fgetc)(struct config *c); + int (*ungetc)(int c, struct config *conf); + long (*ftell)(struct config *c); +}; + +static struct config *cf; static int zlib_compression_seen; +static int config_file_fgetc(struct config *conf) +{ + FILE *f = conf->data; + return fgetc(f); +} + +static int config_file_ungetc(int c, struct config *conf) +{ + FILE *f = conf->data; + return ungetc(c, f); +} + +static long config_file_ftell(struct config *conf) +{ + FILE *f = conf->data; + return ftell(f); +} + #define MAX_INCLUDE_DEPTH 10 static const char include_depth_advice[] = "exceeded maximum include depth (%d) while including\n" @@ -172,13 +194,12 @@ static int get_next_char(void) c = '\n'; if (cf) { - FILE *f = cf->f; - c = fgetc(f); + c = cf->fgetc(cf); if (c == '\r') { /* DOS like systems */ - c = fgetc(f); + c = cf->fgetc(cf); if (c != '\n') { - ungetc(c, f); + cf->ungetc(c, cf); c = '\r'; } } @@ -896,7 +917,7 @@ int git_default_config(const char *var, const char *value, void *dummy) return 0; } -static int do_config_from(struct config_file *top, config_fn_t fn, void *data) +static int do_config_from(struct config *top, config_fn_t fn, void *data) { int ret; @@ -925,10 +946,13 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data) ret = -1; if (f) { - config_file top; + struct config top; - top.f = f; + top.data = f; top.name = filename; + top.fgetc = config_file_fgetc; + top.ungetc = config_file_ungetc; + top.ftell = config_file_ftell; ret = do_config_from(&top, fn, data); @@ -1063,7 +1087,6 @@ static int store_aux(const char *key, const char *value, void *cb) { const char *ep; size_t section_len; - FILE *f = cf->f; switch (store.state) { case KEY_SEEN: @@ -1075,7 +1098,7 @@ static int store_aux(const char *key, const char *value, void *cb) return 1; } - store.offset[store.seen] = ftell(f); + store.offset[store.seen] = cf->ftell(cf); store.seen++; } break; @@ -1102,19 +1125,19 @@ static int store_aux(const char *key, const char *value, void *cb) * Do not increment matches: this is no match, but we * just made sure we are in the desired section. */ - store.offset[store.seen] = ftell(f); + store.offset[store.seen] = cf->ftell(cf); /* fallthru */ case SECTION_END_SEEN: case START: if (matches(key, value)) { - store.offset[store.seen] = ftell(f); + store.offset[store.seen] = cf->ftell(cf); store.state = KEY_SEEN; store.seen++; } else { if (strrchr(key, '.') - key == store.baselen && !strncmp(key, store.key, store.baselen)) { store.state = SECTION_SEEN; - store.offset[store.seen] = ftell(f); + store.offset[store.seen] = cf->ftell(cf); } } } -- 1.8.2.rc0.26.gf7384c5