From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH 1/2] interpolate.[ch]: Add a function to find which interpolations are active.
Date: Tue, 6 Nov 2007 23:38:03 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0711062336510.4362@racer.site> (raw)
In-Reply-To: <Pine.LNX.4.64.0711062335150.4362@racer.site>
Some substitutions require pretty expensive operations. So it makes
sense to find out which are needed to begin with. Call
interp_find_active() to set the new "active" field in the interpolation
table.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
This is the patch that Rene proposed, but squashed into my earlier
patch.
interpolate.c | 20 ++++++++++++++++++++
interpolate.h | 3 +++
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/interpolate.c b/interpolate.c
index 6ef53f2..bbd89bb 100644
--- a/interpolate.c
+++ b/interpolate.c
@@ -102,3 +102,23 @@ unsigned long interpolate(char *result, unsigned long reslen,
*dest = '\0';
return newlen;
}
+
+void interp_find_active(const char *orig,
+ struct interp *interps, int ninterps)
+{
+ char c;
+ int i;
+
+ for (i = 0; i < ninterps; i++)
+ interps[i].active = 0;
+
+ while ((c = *(orig++)))
+ if (c == '%')
+ /* Try to match an interpolation string. */
+ for (i = 0; i < ninterps; i++)
+ if (!prefixcmp(orig, interps[i].name + 1)) {
+ interps[i].active = 1;
+ orig += strlen(interps[i].name + 1);
+ break;
+ }
+}
diff --git a/interpolate.h b/interpolate.h
index 77407e6..d23531a 100644
--- a/interpolate.h
+++ b/interpolate.h
@@ -14,6 +14,7 @@
struct interp {
const char *name;
char *value;
+ int active:1;
};
extern void interp_set_entry(struct interp *table, int slot, const char *value);
@@ -22,5 +23,7 @@ extern void interp_clear_table(struct interp *table, int ninterps);
extern unsigned long interpolate(char *result, unsigned long reslen,
const char *orig,
const struct interp *interps, int ninterps);
+extern void interp_find_active(const char *orig,
+ struct interp *interps, int ninterps);
#endif /* INTERPOLATE_H */
--
1.5.3.5.1597.g7191
next prev parent reply other threads:[~2007-11-06 23:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-04 19:14 [PATCH 0/3] Make user formatted commit listing less expensive Johannes Schindelin
2007-11-04 19:15 ` [PATCH 1/3] Split off the pretty print stuff into its own file Johannes Schindelin
2007-11-05 21:16 ` Junio C Hamano
2007-11-04 19:15 ` [PATCH 2/3] interpolate.[ch]: Add a function to find which interpolations are active Johannes Schindelin
2007-11-04 19:15 ` [PATCH 3/3] pretty=format: Avoid some expensive calculations when not needed Johannes Schindelin
2007-11-05 19:51 ` Junio C Hamano
2007-11-05 20:21 ` René Scharfe
2007-11-05 20:25 ` Jon Loeliger
2007-11-05 23:53 ` Johannes Schindelin
2007-11-06 1:06 ` Junio C Hamano
2007-11-06 22:31 ` René Scharfe
2007-11-06 23:17 ` René Scharfe
2007-11-06 23:45 ` Johannes Schindelin
2007-11-07 23:19 ` René Scharfe
2007-11-08 0:14 ` Johannes Schindelin
2007-11-07 0:11 ` Pierre Habouzit
2007-11-07 0:14 ` Pierre Habouzit
2007-11-07 23:21 ` René Scharfe
2007-11-07 23:31 ` Pierre Habouzit
2007-11-07 20:43 ` Junio C Hamano
2007-11-09 0:49 ` René Scharfe
2007-11-06 23:36 ` Johannes Schindelin
2007-11-06 23:38 ` Johannes Schindelin [this message]
2007-11-06 23:38 ` [PATCH 2/2] " Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0711062336510.4362@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).