diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 21:33:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 21:33:31 (GMT) |
| commit | 3813a89faee3ecb111aa206f68b46618ec853e4e (patch) | |
| tree | 488acb52008ebfe2fa525cf535e6f2df66977e29 /parse-options.h | |
| parent | b21ebb671bb7dea8d342225f0d66c41f4e54d5ca (diff) | |
| parent | 674ba34038568e36090c6c4c616a3266c8b6459e (diff) | |
| download | git-3813a89faee3ecb111aa206f68b46618ec853e4e.zip git-3813a89faee3ecb111aa206f68b46618ec853e4e.tar.gz git-3813a89faee3ecb111aa206f68b46618ec853e4e.tar.bz2 | |
Merge branch 'nd/i18n'
More _("i18n") markings.
* nd/i18n:
fsck: mark strings for translation
fsck: reduce word legos to help i18n
parse-options.c: mark more strings for translation
parse-options.c: turn some die() to BUG()
parse-options: replace opterror() with optname()
repack: mark more strings for translation
remote.c: mark messages for translation
remote.c: turn some error() or die() to BUG()
reflog: mark strings for translation
read-cache.c: add missing colon separators
read-cache.c: mark more strings for translation
read-cache.c: turn die("internal error") to BUG()
attr.c: mark more string for translation
archive.c: mark more strings for translation
alias.c: mark split_cmdline_strerror() strings for translation
git.c: mark more strings for translation
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/parse-options.h b/parse-options.h index a650a7d..81380c2 100644 --- a/parse-options.h +++ b/parse-options.h @@ -186,10 +186,7 @@ extern NORETURN void usage_msg_opt(const char *msg, const struct option *options); extern int optbug(const struct option *opt, const char *reason); -extern int opterror(const struct option *opt, const char *reason, int flags); -#if defined(__GNUC__) -#define opterror(o,r,f) (opterror((o),(r),(f)), const_error()) -#endif +const char *optname(const struct option *opt, int flags); /* * Use these assertions for callbacks that expect to be called with NONEG and |