cuberite/libdeflate
1
0
Fork 0
mirror of https://github.com/cuberite/libdeflate.git synced 2025-09-15 23:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

programs: rename program_invocation_name to prog_invocation_name

Browse Source 
Avoid confusion with the GNU extension 'program_invocation_name', which
is described by 'man 3 program_invocation_name'.  The GNU version isn't
supposed to be exposed without defining _GNU_SOURCE, which we don't in
any of the relevant files, but it's best to avoid any confusion.
This commit is contained in:
Eric Biggers 2020-10-25 20:14:52 -07:00
parent 25a591b94e
commit 7ba3155c17
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/benchmark.c
View File

@ -406,7 +406,7 @@ show_usage(FILE *fp)
" -s SIZE chunk size\n" " -s SIZE chunk size\n"
" -V show version and legal information\n" " -V show version and legal information\n"
" -z use zlib wrapper\n" " -z use zlib wrapper\n"
"\n", program_invocation_name); "\n", prog_invocation_name);
show_available_engines(fp); show_available_engines(fp);
} }

2
programs/checksum.c
View File

@ -42,7 +42,7 @@ show_usage(FILE *fp)
" -s SIZE chunk size\n" " -s SIZE chunk size\n"
" -t show checksum speed, excluding I/O\n" " -t show checksum speed, excluding I/O\n"
" -Z use zlib implementation instead of libdeflate\n", " -Z use zlib implementation instead of libdeflate\n",
program_invocation_name); prog_invocation_name);
} }
typedef u32 (*cksum_fn_t)(u32, const void *, size_t); typedef u32 (*cksum_fn_t)(u32, const void *, size_t);

10
programs/gzip.c
View File

@ -67,7 +67,7 @@ show_usage(FILE *fp)
" -k don't delete input files\n" " -k don't delete input files\n"
" -S SUF use suffix SUF instead of .gz\n" " -S SUF use suffix SUF instead of .gz\n"
" -V show version and legal information\n", " -V show version and legal information\n",
program_invocation_name); prog_invocation_name);
} }
static void static void
@ -87,14 +87,14 @@ show_version(void)
static bool static bool
is_gunzip(void) is_gunzip(void)
{ {
if (tstrxcmp(program_invocation_name, T("gunzip")) == 0) if (tstrxcmp(prog_invocation_name, T("gunzip")) == 0)
return true; return true;
if (tstrxcmp(program_invocation_name, T("libdeflate-gunzip")) == 0) if (tstrxcmp(prog_invocation_name, T("libdeflate-gunzip")) == 0)
return true; return true;
#ifdef _WIN32 #ifdef _WIN32
if (tstrxcmp(program_invocation_name, T("gunzip.exe")) == 0) if (tstrxcmp(prog_invocation_name, T("gunzip.exe")) == 0)
return true; return true;
if (tstrxcmp(program_invocation_name, T("libdeflate-gunzip.exe")) == 0) if (tstrxcmp(prog_invocation_name, T("libdeflate-gunzip.exe")) == 0)
return true; return true;
#endif #endif
return false; return false;

8
programs/prog_util.c
View File

@ -54,14 +54,14 @@
#endif #endif
/* The invocation name of the program (filename component only) */ /* The invocation name of the program (filename component only) */
const tchar *program_invocation_name; const tchar *prog_invocation_name;
static void static void
do_msg(const char *format, bool with_errno, va_list va) do_msg(const char *format, bool with_errno, va_list va)
{ {
int saved_errno = errno; int saved_errno = errno;
fprintf(stderr, "%"TS": ", program_invocation_name); fprintf(stderr, "%"TS": ", prog_invocation_name);
vfprintf(stderr, format, va); vfprintf(stderr, format, va);
if (with_errno) if (with_errno)
fprintf(stderr, ": %s\n", strerror(saved_errno)); fprintf(stderr, ": %s\n", strerror(saved_errno));
@ -129,7 +129,7 @@ get_filename(const tchar *path)
void void
begin_program(tchar *argv[]) begin_program(tchar *argv[])
{ {
program_invocation_name = get_filename(argv[0]); prog_invocation_name = get_filename(argv[0]);
#ifdef FREESTANDING #ifdef FREESTANDING
/* This allows testing freestanding library builds. */ /* This allows testing freestanding library builds. */
@ -233,7 +233,7 @@ retry:
} }
fprintf(stderr, "%"TS": %"TS" already exists; " fprintf(stderr, "%"TS": %"TS" already exists; "
"overwrite? (y/n) ", "overwrite? (y/n) ",
program_invocation_name, strm->name); prog_invocation_name, strm->name);
if (getchar() != 'y') { if (getchar() != 'y') {
msg("Not overwriting."); msg("Not overwriting.");
goto err; goto err;

2
programs/prog_util.h
View File

@ -133,7 +133,7 @@ int wmain(int argc, wchar_t **argv);
#endif /* !_WIN32 */ #endif /* !_WIN32 */
extern const tchar *program_invocation_name; extern const tchar *prog_invocation_name;
void _printf(1, 2) msg(const char *fmt, ...); void _printf(1, 2) msg(const char *fmt, ...);
void _printf(1, 2) msg_errno(const char *fmt, ...); void _printf(1, 2) msg_errno(const char *fmt, ...);