diff options
| -rw-r--r-- | libq/i18n.h | 17 | ||||
| -rw-r--r-- | main.c | 14 | ||||
| -rw-r--r-- | main.h | 9 | ||||
| -rw-r--r-- | qcheck.c | 2 |
4 files changed, 10 insertions, 32 deletions
diff --git a/libq/i18n.h b/libq/i18n.h deleted file mode 100644 index 50f36ea..0000000 --- a/libq/i18n.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _I18N_H -#define _I18N_H - -#if ENABLE_NLS -# include <locale.h> -# include <libintl.h> -# define _(String) gettext (String) -# define decimal_point localeconv()->decimal_point -#else -# define _(String) (String) -# define setlocale(x,y) -# define bindtextdomain(x,y) -# define textdomain(x) -# define decimal_point "." -#endif - -#endif @@ -1,5 +1,5 @@ /* - * Copyright 2005-2023 Gentoo Foundation + * Copyright 2005-2024 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 * * Copyright 2005-2008 Ned Ludd - <solar@gentoo.org> @@ -106,13 +106,13 @@ usage(int status, const char *flags, struct option const opts[], fprintf(fp, " %s%9s%s %s%-16s%s%s:%s %s\n", YELLOW, applets[i].name, NORM, DKBLUE, applets[i].opts, NORM, - RED, NORM, _(applets[i].desc)); + RED, NORM, applets[i].desc); } else if (blabber > 0) { fprintf(fp, "%susage:%s %s%s%s [opts] %s%s%s %s:%s %s\n", GREEN, NORM, YELLOW, applets[blabber].name, NORM, DKBLUE, applets[blabber].opts, NORM, - RED, NORM, _(applets[blabber].desc)); + RED, NORM, applets[blabber].desc); if (desc) fprintf(fp, "\n%s\n", desc); } @@ -154,10 +154,10 @@ usage(int status, const char *flags, struct option const opts[], /* then wrap the help text, if necessary */ prefixlen = 6 + 2 + optlen + 1 + 1 + 1; if ((size_t)twidth < prefixlen + 10) { - fprintf(fp, "%s\n", _(help[i])); + fprintf(fp, "%s\n", help[i]); } else { const char *t; - hstr = _(help[i]); + hstr = help[i]; l = strlen(hstr); while (twidth - prefixlen < l) { /* search backwards for a space */ @@ -1240,10 +1240,6 @@ int main(int argc, char **argv) IF_DEBUG(init_coredumps()); argv0 = argv[0]; - setlocale(LC_ALL, ""); - bindtextdomain(argv0, CONFIG_EPREFIX "usr/share/locale"); - textdomain(argv0); - /* note: setting nocolor here is pointless, since * initialize_portage_env is going to re-init nocolor, so make * sure we modify the default instead. */ @@ -1,5 +1,5 @@ /* - * Copyright 2005-2021 Gentoo Foundation + * Copyright 2005-2024 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 * * Copyright 2005-2010 Ned Ludd - <solar@gentoo.org> @@ -23,7 +23,6 @@ #include <string.h> #include "colors.h" -#include "i18n.h" #include "set.h" extern const char *argv0; @@ -87,8 +86,8 @@ extern const char *argv0; #define likely(x) __builtin_expect((x), 1) #define unlikely(x) __builtin_expect((x), 0) -#define qfprintf(stream, fmt, args...) do { if (!quiet) fprintf(stream, _( fmt ), ## args); } while (0) -#define qprintf(fmt, args...) qfprintf(stdout, _( fmt ), ## args) +#define qfprintf(stream, fmt, args...) do { if (!quiet) fprintf(stream, fmt, ## args); } while (0) +#define qprintf(fmt, args...) qfprintf(stdout, fmt, ## args) #define _q_unused_ __attribute__((__unused__)) @@ -125,7 +124,7 @@ extern FILE *warnout; #define warn(fmt, args...) #else #define warn(fmt, args...) \ - fprintf(warnout, _("%s%s%s: " fmt "\n"), RED, argv0, NORM , ## args) + fprintf(warnout, "%s%s%s: " fmt "\n", RED, argv0, NORM , ## args) #endif #define warnf(fmt, args...) warn("%s%s()%s: " fmt, YELLOW, __func__, NORM , ## args) #define warnl(fmt, args...) warn("%s%i()%s: " fmt, YELLOW, __LINE__, NORM , ## args) @@ -55,7 +55,7 @@ static const char * const qcheck_opts_help[] = { }; #define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qcheck_opts_help, NULL, lookup_applet_idx("qcheck")) -#define qcprintf(fmt, args...) do { if (!state->bad_only) printf(_(fmt), ## args); } while (0) +#define qcprintf(fmt, args...) do { if (!state->bad_only) printf(fmt, ## args); } while (0) struct qcheck_opt_state { array_t *atoms; |