mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse-options: simplify usage_padding()

Browse Source 
c512643e67 (short help: allow a gap smaller than USAGE_GAP, 2023-07-18)
effectively did away with the two-space gap between options and their
description; one space is enough now.  Incorporate USAGE_GAP into
USAGE_OPTS_WIDTH, merge the two cases with enough space on the line and
incorporate the newline into the format for the remaining case.  The
output remains the same.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2023-08-05 16:52:42 +02:00
committed by Junio C Hamano
parent 2a409a1d12
commit 311c8ff11c
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parse-options.c
View File

@ -1025,21 +1025,14 @@ static int usage_indent(FILE *outfile)
return fprintf(outfile, " "); return fprintf(outfile, " ");
} }
#define USAGE_OPTS_WIDTH 24 #define USAGE_OPTS_WIDTH 26
#define USAGE_GAP 2
static void usage_padding(FILE *outfile, size_t pos) static void usage_padding(FILE *outfile, size_t pos)
{ {
int pad; if (pos < USAGE_OPTS_WIDTH)
if (pos == USAGE_OPTS_WIDTH + 1) fprintf(outfile, "%*s", USAGE_OPTS_WIDTH - (int)pos, "");
pad = -1; else
else if (pos <= USAGE_OPTS_WIDTH) fprintf(outfile, "\n%*s", USAGE_OPTS_WIDTH, "");
pad = USAGE_OPTS_WIDTH - pos;
else {
fputc('\n', outfile);
pad = USAGE_OPTS_WIDTH;
}
fprintf(outfile, "%*s", pad + USAGE_GAP, "");
} }
static const struct option *find_option_by_long_name(const struct option *opts, static const struct option *find_option_by_long_name(const struct option *opts,