From e8d28c50c6d3a73d1a6f514095304bfe0973ff2a Mon Sep 17 00:00:00 2001 From: "Sven M. Hallberg" Date: Wed, 20 Aug 2014 13:52:08 +0200 Subject: [PATCH] remove disused i18n stuff --- avahi/Makefile.am | 3 +- avahi/error.c | 115 ++++++++++++++++++++++------------------------ avahi/i18n.c | 42 ----------------- avahi/i18n.h | 53 --------------------- 4 files changed, 57 insertions(+), 156 deletions(-) delete mode 100644 avahi/i18n.c delete mode 100644 avahi/i18n.h diff --git a/avahi/Makefile.am b/avahi/Makefile.am index c850392..5100c20 100644 --- a/avahi/Makefile.am +++ b/avahi/Makefile.am @@ -59,7 +59,6 @@ libavahi_la_SOURCES = \ watch.h gccmacro.h \ rlist.h rlist.c \ utf8.c utf8.h \ - i18n.c i18n.h \ timeeventq.c timeeventq.h\ iface.c iface.h \ server.c internal.h entry.c \ @@ -107,6 +106,6 @@ libavahi_la_SOURCES += \ endif endif -libavahi_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\" +libavahi_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) libavahi_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS) libavahi_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_VERSION_INFO) diff --git a/avahi/error.c b/avahi/error.c index 63c5033..0005f87 100644 --- a/avahi/error.c +++ b/avahi/error.c @@ -22,76 +22,73 @@ #endif #include "error.h" -#include "i18n.h" const char *avahi_strerror(int error) { const char * const msg[- AVAHI_ERR_MAX] = { - N_("OK"), - N_("Operation failed"), - N_("Bad state"), - N_("Invalid host name"), - N_("Invalid domain name"), - N_("No suitable network protocol available"), - N_("Invalid DNS TTL"), - N_("Resource record key is pattern"), - N_("Local name collision"), - N_("Invalid record"), + "OK", + "Operation failed", + "Bad state", + "Invalid host name", + "Invalid domain name", + "No suitable network protocol available", + "Invalid DNS TTL", + "Resource record key is pattern", + "Local name collision", + "Invalid record", - N_("Invalid service name"), - N_("Invalid service type"), - N_("Invalid port number"), - N_("Invalid record key"), - N_("Invalid address"), - N_("Timeout reached"), - N_("Too many clients"), - N_("Too many objects"), - N_("Too many entries"), - N_("OS Error"), + "Invalid service name", + "Invalid service type", + "Invalid port number", + "Invalid record key", + "Invalid address", + "Timeout reached", + "Too many clients", + "Too many objects", + "Too many entries", + "OS Error", - N_("Access denied"), - N_("Invalid operation"), - N_("An unexpected D-Bus error occurred"), - N_("Daemon connection failed"), - N_("Memory exhausted"), - N_("The object passed in was not valid"), - N_("Daemon not running"), - N_("Invalid interface index"), - N_("Invalid protocol specification"), - N_("Invalid flags"), + "Access denied", + "Invalid operation", + "An unexpected D-Bus error occurred", + "Daemon connection failed", + "Memory exhausted", + "The object passed in was not valid", + "Daemon not running", + "Invalid interface index", + "Invalid protocol specification", + "Invalid flags", - N_("Not found"), - N_("Invalid configuration"), - N_("Version mismatch"), - N_("Invalid service subtype"), - N_("Invalid packet"), - N_("Invalid DNS return code"), - N_("DNS failure: FORMERR"), - N_("DNS failure: SERVFAIL"), - N_("DNS failure: NXDOMAIN"), - N_("DNS failure: NOTIMP"), + "Not found", + "Invalid configuration", + "Version mismatch", + "Invalid service subtype", + "Invalid packet", + "Invalid DNS return code", + "DNS failure: FORMERR", + "DNS failure: SERVFAIL", + "DNS failure: NXDOMAIN", + "DNS failure: NOTIMP", - N_("DNS failure: REFUSED"), - N_("DNS failure: YXDOMAIN"), - N_("DNS failure: YXRRSET"), - N_("DNS failure: NXRRSET"), - N_("DNS failure: NOTAUTH"), - N_("DNS failure: NOTZONE"), - N_("Invalid RDATA"), - N_("Invalid DNS type"), - N_("Invalid DNS class"), - N_("Not supported"), + "DNS failure: REFUSED", + "DNS failure: YXDOMAIN", + "DNS failure: YXRRSET", + "DNS failure: NXRRSET", + "DNS failure: NOTAUTH", + "DNS failure: NOTZONE", + "Invalid RDATA", + "Invalid DNS type", + "Invalid DNS class", + "Not supported", - N_("Not permitted"), - N_("Invalid argument"), - N_("Is empty"), - N_("The requested operation is invalid because redundant") + "Not permitted", + "Invalid argument", + "Is empty", + "The requested operation is invalid because redundant" }; - avahi_init_i18n(); - if (-error < 0 || -error >= -AVAHI_ERR_MAX) - return _("Invalid Error Code"); + return "Invalid Error Code"; - return _(msg[-error]); + return msg[-error]; } diff --git a/avahi/i18n.c b/avahi/i18n.c deleted file mode 100644 index 509abbe..0000000 --- a/avahi/i18n.c +++ /dev/null @@ -1,42 +0,0 @@ -/*** - This file is part of avahi. - - avahi is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - avahi is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General - Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with avahi; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. - ***/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "i18n.h" - -void avahi_init_i18n(void) { -#ifdef ENABLE_NLS - - /* Not really thread safe, but this doesn't matter much since - * bindtextdomain is supposed to be idempotent anyway. */ - /* FIXME: but is bindtextdomain reentrant!? */ - - static int done = 0; - - if (!done) { - bindtextdomain(GETTEXT_PACKAGE, AVAHI_LOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - done = 1; - } - -#endif /* ENABLE_NLS */ -} diff --git a/avahi/i18n.h b/avahi/i18n.h deleted file mode 100644 index f46931d..0000000 --- a/avahi/i18n.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef fooi18nhfoo -#define fooi18nhfoo - -/*** - This file is part of avahi. - - avahi is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - avahi is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General - Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with avahi; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#ifdef ENABLE_NLS - -#if !defined(GETTEXT_PACKAGE) -#error "Something is very wrong here, config.h needs to be included first" -#endif - -#include - -#define _(String) dgettext(GETTEXT_PACKAGE, String) -#ifdef gettext_noop -#define N_(String) gettext_noop(String) -#else -#define N_(String) (String) -#endif - -#else /* NLS is disabled */ - -#define _(String) (String) -#define N_(String) (String) -#define textdomain(String) (String) -#define gettext(String) (String) -#define dgettext(Domain,String) (String) -#define dcgettext(Domain,String,Type) (String) -#define bindtextdomain(Domain,Directory) (Domain) -#define bind_textdomain_codeset(Domain,Codeset) (Codeset) - -#endif /* ENABLE_NLS */ - -void avahi_init_i18n(void); - -#endif -- 2.39.5