Junio C Hamano schrieb:Not from the rational part of my brain, for sure. The following on top of Dscho's second patch? (A char would be smaller, but a bitfield documents the intent better.) diff --git a/interpolate.c b/interpolate.c index 80eeb36..1e4ccaf 100644 --- a/interpolate.c +++ b/interpolate.c @@ -103,22 +103,21 @@ unsigned long interpolate(char *result, unsigned long reslen, return newlen; } -char *interp_find_active(const char *orig, - const struct interp *interps, int ninterps) +void interp_find_active(const char *orig, struct interp *interps, int ninterps) { - char *result = xcalloc(1, 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)) { - result[i] = 1; + interps[i].active = 1; orig += strlen(interps[i].name + 1); break; } - - return result; } diff --git a/interpolate.h b/interpolate.h index 2d197c5..a8ee6b9 100644 --- a/interpolate.h +++ b/interpolate.h @@ -14,6 +14,7 @@ struct interp { const char *name; char *value; + unsigned active:1; }; extern void interp_set_entry(struct interp *table, int slot, const char *value); @@ -22,7 +23,6 @@ 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 char *interp_find_active(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 */ - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Martin Schwidefsky | Re: x86 arch updates also broke s390 |
| Chuck Ebbert | Why do so many machines need "noapic"? |
| Greg KH | Re: [BUG] 2.6.24-git usb reset problems |
| Rafael J. Wysocki | [Bug #11822] ACPI Warning (nspredef-0858): _SB_.PCI0.LPC_.EC__.BAT0._BIF: Return P... |
git: | |
| Nicolas Bock | error: cannot lock ref 'refs/remotes/origin/*' |
| Peter Karlsson | RCS keyword expansion |
| Matthieu Moy | git push to a non-bare repository |
| Oliver Kullmann | "bash: git-upload-pack: command not found" ?? |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| Daniel Ouellet | identifying sparse files and get ride of them trick available? |
| Richard Stallman | Real men don't attack straw men |
| Christian Weisgerber | Re: libiconv problem |
| Dushan Tcholich | Re: ksoftirqd high cpu load on kernels 2.6.24 to 2.6.27-rc1-mm1 |
| Larry McVoy | Re: tcp bw in 2.6 |
| Jeff Garzik | Re: [bug?] tg3: Failed to load firmware "tigon/tg3_tso.bin" |
| Jarek Poplawski | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
