db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

Replace warnx by elog

Browse Source
This commit is contained in:
stalkerg
2016-12-08 13:52:34 +03:00
parent 62860f994c
commit 25445d9993
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgut/getopt.h
-2
View File
@@ -57,7 +57,6 @@ struct option {
int val;
};
__BEGIN_DECLS
int getopt_long(int, char * const *, const char *,
const struct option *, int *);
int getopt_long_only(int, char * const *, const char *,
@@ -73,6 +72,5 @@ extern int optind, opterr, optopt;
#define _OPTRESET_DECLARED
extern int optreset; /* getopt(3) external variable */
#endif
__END_DECLS
#endif /* !_GETOPT_H_ */
pgut/getopt_long.c
+20 -9
View File
@@ -51,12 +51,23 @@
#include <sys/cdefs.h>
#include <err.h>
#include <errno.h>
#include "getopt.h"
#include <stdlib.h>
#include <string.h>
#define LOG (-4)
#define INFO (-3)
#define NOTICE (-2)
#define WARNING (-1)
#define ERROR 1
#define FATAL 2
#define PANIC 3
extern void
elog(int elevel, const char *fmt, ...)
__attribute__((format(printf, 2, 3)));
#define GNU_COMPATIBLE /* Be more compatible, configure's use us! */
@@ -245,7 +256,7 @@ parse_long_options(char * const *nargv, const char *options,
if (!exact_match && second_partial_match) {
/* ambiguous abbreviation */
if (PRINT_ERROR)
warnx(ambig,
elog(WARNING, ambig,
#ifdef GNU_COMPATIBLE
current_dash,
#endif
@@ -258,7 +269,7 @@ parse_long_options(char * const *nargv, const char *options,
if (long_options[match].has_arg == no_argument
&& has_equal) {
if (PRINT_ERROR)
warnx(noarg,
elog(WARNING, noarg,
#ifdef GNU_COMPATIBLE
current_dash,
#endif
@@ -296,7 +307,7 @@ parse_long_options(char * const *nargv, const char *options,
* should be generated.
*/
if (PRINT_ERROR)
warnx(recargstring,
elog(WARNING, recargstring,
#ifdef GNU_COMPATIBLE
current_dash,
#endif
@@ -317,7 +328,7 @@ parse_long_options(char * const *nargv, const char *options,
return (-1);
}
if (PRINT_ERROR)
warnx(illoptstring,
elog(WARNING, illoptstring,
#ifdef GNU_COMPATIBLE
current_dash,
#endif
@@ -494,11 +505,11 @@ start:
++optind;
#ifdef GNU_COMPATIBLE
if (PRINT_ERROR)
warnx(posixly_correct ? illoptchar : gnuoptchar,
elog(WARNING, posixly_correct ? illoptchar : gnuoptchar,
optchar);
#else
if (PRINT_ERROR)
warnx(illoptchar, optchar);
elog(WARNING, illoptchar, optchar);
#endif
optopt = optchar;
return (BADCH);
@@ -510,7 +521,7 @@ start:
else if (++optind >= nargc) { /* no arg */
place = EMSG;
if (PRINT_ERROR)
warnx(recargchar, optchar);
elog(WARNING, recargchar, optchar);
optopt = optchar;
return (BADARG);
} else /* white space */
@@ -534,7 +545,7 @@ start:
if (++optind >= nargc) { /* no arg */
place = EMSG;
if (PRINT_ERROR)
warnx(recargchar, optchar);
elog(WARNING, recargchar, optchar);
optopt = optchar;
return (BADARG);
} else