mirror of
https://github.com/git/git.git
synced 2024-10-28 04:49:43 +01:00
mailinfo: we parse fixed headers
The code was written as if we have a small room to add additional headers to be parsed to the header[] array at runtime, but that is not our intention at all. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
fa3b914457
commit
be10ac7037
1 changed files with 8 additions and 8 deletions
16
mailinfo.c
16
mailinfo.c
|
@ -346,10 +346,10 @@ static void cleanup_subject(struct mailinfo *mi, struct strbuf *subject)
|
|||
strbuf_trim(subject);
|
||||
}
|
||||
|
||||
#define MAX_HDR_PARSED 10
|
||||
static const char *header[MAX_HDR_PARSED] = {
|
||||
"From","Subject","Date",
|
||||
static const char * const header[] = {
|
||||
"From", "Subject", "Date",
|
||||
};
|
||||
#define MAX_HDR_PARSED (ARRAY_SIZE(header) + 1)
|
||||
|
||||
static inline int skip_header(const struct strbuf *line, const char *hdr,
|
||||
const char **outval)
|
||||
|
@ -583,7 +583,7 @@ static int check_header(struct mailinfo *mi,
|
|||
struct strbuf sb = STRBUF_INIT;
|
||||
|
||||
/* search for the interesting parts */
|
||||
for (i = 0; header[i]; i++) {
|
||||
for (i = 0; i < ARRAY_SIZE(header); i++) {
|
||||
if ((!hdr_data[i] || overwrite) &&
|
||||
parse_header(line, header[i], mi, &sb)) {
|
||||
handle_header(&hdr_data[i], &sb);
|
||||
|
@ -625,7 +625,7 @@ static int is_inbody_header(const struct mailinfo *mi,
|
|||
{
|
||||
int i;
|
||||
const char *val;
|
||||
for (i = 0; header[i]; i++)
|
||||
for (i = 0; i < ARRAY_SIZE(header); i++)
|
||||
if (!mi->s_hdr_data[i] && skip_header(line, header[i], &val))
|
||||
return 1;
|
||||
return 0;
|
||||
|
@ -772,7 +772,7 @@ static int check_inbody_header(struct mailinfo *mi, const struct strbuf *line)
|
|||
return is_format_patch_separator(line->buf + 1, line->len - 1);
|
||||
if (starts_with(line->buf, "[PATCH]") && isspace(line->buf[7])) {
|
||||
int i;
|
||||
for (i = 0; header[i]; i++)
|
||||
for (i = 0; i < ARRAY_SIZE(header); i++)
|
||||
if (!strcmp("Subject", header[i])) {
|
||||
handle_header(&mi->s_hdr_data[i], line);
|
||||
return 1;
|
||||
|
@ -824,7 +824,7 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
|
|||
* We may have already read "secondary headers"; purge
|
||||
* them to give ourselves a clean restart.
|
||||
*/
|
||||
for (i = 0; header[i]; i++) {
|
||||
for (i = 0; i < ARRAY_SIZE(header); i++) {
|
||||
if (mi->s_hdr_data[i])
|
||||
strbuf_release(mi->s_hdr_data[i]);
|
||||
FREE_AND_NULL(mi->s_hdr_data[i]);
|
||||
|
@ -1155,7 +1155,7 @@ static void handle_info(struct mailinfo *mi)
|
|||
struct strbuf *hdr;
|
||||
int i;
|
||||
|
||||
for (i = 0; header[i]; i++) {
|
||||
for (i = 0; i < ARRAY_SIZE(header); i++) {
|
||||
/* only print inbody headers if we output a patch file */
|
||||
if (mi->patch_lines && mi->s_hdr_data[i])
|
||||
hdr = mi->s_hdr_data[i];
|
||||
|
|
Loading…
Reference in a new issue