sequencer: make read_oneliner() extern
The function read_oneliner() is a generally useful util function. Instead of hiding it as a static function within sequencer.c, extern it so that it can be reused by others. This patch is best viewed with --color-moved. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
bfa50c2c7f
commit
c20de8bec6
14
sequencer.c
14
sequencer.c
|
@ -419,19 +419,7 @@ static int write_message(const void *buf, size_t len, const char *filename,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define READ_ONELINER_SKIP_IF_EMPTY (1 << 0)
|
int read_oneliner(struct strbuf *buf,
|
||||||
#define READ_ONELINER_WARN_MISSING (1 << 1)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Reads a file that was presumably written by a shell script, i.e. with an
|
|
||||||
* end-of-line marker that needs to be stripped.
|
|
||||||
*
|
|
||||||
* Note that only the last end-of-line marker is stripped, consistent with the
|
|
||||||
* behavior of "$(cat path)" in a shell script.
|
|
||||||
*
|
|
||||||
* Returns 1 if the file was read, 0 if it could not be read or does not exist.
|
|
||||||
*/
|
|
||||||
static int read_oneliner(struct strbuf *buf,
|
|
||||||
const char *path, unsigned flags)
|
const char *path, unsigned flags)
|
||||||
{
|
{
|
||||||
int orig_len = buf->len;
|
int orig_len = buf->len;
|
||||||
|
|
14
sequencer.h
14
sequencer.h
|
@ -198,6 +198,20 @@ void print_commit_summary(struct repository *repo,
|
||||||
const struct object_id *oid,
|
const struct object_id *oid,
|
||||||
unsigned int flags);
|
unsigned int flags);
|
||||||
|
|
||||||
|
#define READ_ONELINER_SKIP_IF_EMPTY (1 << 0)
|
||||||
|
#define READ_ONELINER_WARN_MISSING (1 << 1)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Reads a file that was presumably written by a shell script, i.e. with an
|
||||||
|
* end-of-line marker that needs to be stripped.
|
||||||
|
*
|
||||||
|
* Note that only the last end-of-line marker is stripped, consistent with the
|
||||||
|
* behavior of "$(cat path)" in a shell script.
|
||||||
|
*
|
||||||
|
* Returns 1 if the file was read, 0 if it could not be read or does not exist.
|
||||||
|
*/
|
||||||
|
int read_oneliner(struct strbuf *buf,
|
||||||
|
const char *path, unsigned flags);
|
||||||
int read_author_script(const char *path, char **name, char **email, char **date,
|
int read_author_script(const char *path, char **name, char **email, char **date,
|
||||||
int allow_missing);
|
int allow_missing);
|
||||||
void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
|
void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
|
||||||
|
|
Loading…
Reference in New Issue