global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-01 13:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

sequencer: allow the sequencer to take custody of malloc()ed data

Browse Source 
The sequencer is our attempt to lib-ify cherry-pick. Yet it behaves
like a one-shot command when it reads its configuration: memory is
allocated and released only when the command exits.

This is kind of okay for git-cherry-pick, which *is* a one-shot
command. All the work to make the sequencer its work horse was
done to allow using the functionality as a library function, though,
including proper clean-up after use.

This patch introduces an API to pass the responsibility of releasing
certain memory to the sequencer. Example:

	const char *label =
		sequencer_entrust(opts, xstrfmt("From: %s", email));

The entrusted memory will remain valid until sequencer_remove_state() is
called, or the program exits, whichever comes first.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-06-09 09:43:42 +02:00
parent 3142bd5dc3
commit 547ac9d2de
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sequencer.c
View File

@@ -114,9 +114,22 @@ static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob,
return 1;
}
void *sequencer_entrust(struct replay_opts *opts, void *to_free)
{
ALLOC_GROW(opts->owned, opts->owned_nr + 1, opts->owned_alloc);
opts->owned[opts->owned_nr++] = to_free;
return to_free;
}
static void remove_sequencer_state(const struct replay_opts *opts)
{
struct strbuf dir = STRBUF_INIT;
int i;
for (i = 0; i < opts->owned_nr; i++)
free(opts->owned[i]);
free(opts->owned);
strbuf_addf(&dir, "%s", get_dir(opts));
remove_dir_recursively(&dir, 0);

10
sequencer.h
View File

@@ -43,9 +43,19 @@ struct replay_opts {
/* Only used by REPLAY_NONE */
struct rev_info *revs;
/* malloc()ed data entrusted to the sequencer */
void **owned;
int owned_nr, owned_alloc;
};
#define REPLAY_OPTS_INIT { -1, -1 }
/*
* Make it the duty of sequencer_remove_state() to release the memory;
* For ease of use, return the same pointer.
*/
void *sequencer_entrust(struct replay_opts *opts, void *to_free);
int sequencer_pick_revisions(struct replay_opts *opts);
extern const char sign_off_header[];