aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-11-26 17:37:11 +0000
committerRoland McGrath <roland@gnu.org>1995-11-26 17:37:11 +0000
commitcbd3dceb398526fda2fc62674dc873c5c8f5b38d (patch)
tree6fb3253482b342f11beeddd7a880c2898ad1cddc
parentfbaad1494f7fa9e52c391a926d1c3a015604eb58 (diff)
downloadglibc-cbd3dceb398526fda2fc62674dc873c5c8f5b38d.tar.xz
glibc-cbd3dceb398526fda2fc62674dc873c5c8f5b38d.zip
Sat Nov 25 02:48:47 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* assert/assert-perr.c, assert/assert.c, inet/rcmd.c, malloc/mcheck.c, malloc/vm-limit.c, posix/getconf.c, posix/id.c, resolv/herror.c, sunrpc/auth_unix.c, sunrpc/clnt_perr.c, sunrpc/clnt_raw.c, sunrpc/get_myaddr.c, sunrpc/pmap_clnt.c, sunrpc/pmap_rmt.c, sunrpc/portmap.c, sunrpc/rpc_main.c, sunrpc/rpc_parse.c, sunrpc/rpc_scan.c, sunrpc/rpc_util.c, sunrpc/rpcinfo.c, sunrpc/svc_simple.c, sunrpc/svc_tcp.c, sunrpc/svc_udp.c, time/zdump.c, time/zic.c: Mark translatable strings. Sat Nov 25 02:48:47 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu> * assert/assert-perr.c, assert/assert.c, inet/rcmd.c, malloc/mcheck.c, malloc/vm-limit.c, posix/getconf.c, posix/id.c, resolv/herror.c, sunrpc/auth_unix.c, sunrpc/clnt_perr.c, sunrpc/clnt_raw.c, sunrpc/get_myaddr.c, sunrpc/pmap_clnt.c, sunrpc/pmap_rmt.c, sunrpc/portmap.c, sunrpc/rpc_main.c, sunrpc/rpc_parse.c, sunrpc/rpc_scan.c, sunrpc/rpc_util.c, sunrpc/rpcinfo.c, sunrpc/svc_simple.c, sunrpc/svc_tcp.c, sunrpc/svc_udp.c, time/zdump.c, time/zic.c: Mark translatable strings.
-rw-r--r--ChangeLog12
-rw-r--r--assert/assert-perr.c2
-rw-r--r--assert/assert.c4
-rw-r--r--inet/rcmd.c26
-rw-r--r--posix/getconf.c6
-rw-r--r--posix/id.c8
-rw-r--r--resolv/herror.c24
-rw-r--r--sunrpc/auth_unix.c18
-rw-r--r--sunrpc/clnt_perr.c128
-rw-r--r--sunrpc/clnt_raw.c14
-rw-r--r--sunrpc/get_myaddr.c15
-rw-r--r--sunrpc/pmap_clnt.c12
-rw-r--r--sunrpc/pmap_rmt.c32
-rw-r--r--sunrpc/portmap.c36
-rw-r--r--sunrpc/rpc_main.c38
-rw-r--r--sunrpc/rpc_parse.c28
-rw-r--r--sunrpc/rpc_scan.c42
-rw-r--r--sunrpc/rpc_util.c42
-rw-r--r--sunrpc/rpcinfo.c67
-rw-r--r--sunrpc/svc_simple.c30
-rw-r--r--sunrpc/svc_tcp.c28
-rw-r--r--sunrpc/svc_udp.c52
-rw-r--r--time/zdump.c6
-rw-r--r--time/zic.c139
24 files changed, 412 insertions, 397 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ae4f584e6..2d3606f307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Nov 25 02:48:47 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
+
+ * assert/assert-perr.c, assert/assert.c, inet/rcmd.c,
+ malloc/mcheck.c, malloc/vm-limit.c, posix/getconf.c, posix/id.c,
+ resolv/herror.c, sunrpc/auth_unix.c, sunrpc/clnt_perr.c,
+ sunrpc/clnt_raw.c, sunrpc/get_myaddr.c, sunrpc/pmap_clnt.c,
+ sunrpc/pmap_rmt.c, sunrpc/portmap.c, sunrpc/rpc_main.c,
+ sunrpc/rpc_parse.c, sunrpc/rpc_scan.c, sunrpc/rpc_util.c,
+ sunrpc/rpcinfo.c, sunrpc/svc_simple.c, sunrpc/svc_tcp.c,
+ sunrpc/svc_udp.c, time/zdump.c, time/zic.c: Mark translatable
+ strings.
+
Sun Nov 26 02:00:02 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* misc/syslog.c (vsyslog) [USE_IN_LIBIO]: Adapted for libio.
diff --git a/assert/assert-perr.c b/assert/assert-perr.c
index b0436ad575..f9aeb895c4 100644
--- a/assert/assert-perr.c
+++ b/assert/assert-perr.c
@@ -43,7 +43,7 @@ __assert_perror_fail (int errnum,
#endif
/* Print the message. */
- (void) fprintf (stderr, "%s%s%s:%u: %s%sUnexpected error: %s.\n",
+ (void) fprintf (stderr, _("%s%s%s:%u: %s%sUnexpected error: %s.\n"),
__assert_program_name ? __assert_program_name : "",
__assert_program_name ? ": " : "",
file, line,
diff --git a/assert/assert.c b/assert/assert.c
index 9da9e22be4..0160b40bbc 100644
--- a/assert/assert.c
+++ b/assert/assert.c
@@ -38,14 +38,14 @@ CONST char *__assert_program_name;
void
DEFUN(__assert_fail, (assertion, file, line, function),
CONST char *assertion AND
- CONST char *file AND unsigned int line AND CONST char *function)
+ CONST char *file AND unsigned int line AND CONST char *function)
{
#ifdef FATAL_PREPARE
FATAL_PREPARE;
#endif
/* Print the message. */
- (void) fprintf (stderr, "%s%s%s:%u: %s%sAssertion `%s' failed.\n",
+ (void) fprintf (stderr, _("%s%s%s:%u: %s%sAssertion `%s' failed.\n"),
__assert_program_name ? __assert_program_name : "",
__assert_program_name ? ": " : "",
file, line,
diff --git a/inet/rcmd.c b/inet/rcmd.c
index e5b28c63f8..ae6e0b65c7 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -83,7 +83,7 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
if (s < 0) {
if (errno == EAGAIN)
(void)fprintf(stderr,
- "rcmd: socket: All ports in use\n");
+ _("rcmd: socket: All ports in use\n"));
else
(void)fprintf(stderr, "rcmd: socket: %s\n",
strerror(errno));
@@ -109,13 +109,13 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
if (hp->h_addr_list[1] != NULL) {
int oerrno = errno;
- (void)fprintf(stderr, "connect to address %s: ",
+ (void)fprintf(stderr, _("connect to address %s: "),
inet_ntoa(sin.sin_addr));
errno = oerrno;
perror(0);
hp->h_addr_list++;
bcopy(hp->h_addr_list[0], &sin.sin_addr, hp->h_length);
- (void)fprintf(stderr, "Trying %s...\n",
+ (void)fprintf(stderr, _("Trying %s...\n"),
inet_ntoa(sin.sin_addr));
continue;
}
@@ -138,7 +138,7 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
(void)snprintf(num, sizeof(num), "%d", lport);
if (write(s, num, strlen(num)+1) != strlen(num)+1) {
(void)fprintf(stderr,
- "rcmd: write (setting up stderr): %s\n",
+ _("rcmd: write (setting up stderr): %s\n"),
strerror(errno));
(void)close(s2);
goto bad;
@@ -151,11 +151,11 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
!FD_ISSET(s2, &reads)) {
if (errno != 0)
(void)fprintf(stderr,
- "rcmd: select (setting up stderr): %s\n",
- strerror(errno));
+ _("rcmd: select (setting up stderr): %s\n"),
+ strerror(errno));
else
(void)fprintf(stderr,
- "select: protocol failure in circuit setup\n");
+ _("select: protocol failure in circuit setup\n"));
(void)close(s2);
goto bad;
}
@@ -173,7 +173,7 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
from.sin_port >= IPPORT_RESERVED ||
from.sin_port < IPPORT_RESERVED / 2) {
(void)fprintf(stderr,
- "socket: protocol failure in circuit setup.\n");
+ _("socket: protocol failure in circuit setup.\n"));
goto bad2;
}
}
@@ -318,15 +318,15 @@ again:
*/
cp = NULL;
if (lstat(pbuf, &sbuf) < 0)
- cp = ".rhosts lstat failed";
+ cp = _(".rhosts lstat failed");
else if (!S_ISREG(sbuf.st_mode))
- cp = ".rhosts not regular file";
+ cp = _(".rhosts not regular file");
else if (fstat(fileno(hostf), &sbuf) < 0)
- cp = ".rhosts fstat failed";
+ cp = _(".rhosts fstat failed");
else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
- cp = "bad .rhosts owner";
+ cp = _("bad .rhosts owner");
else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
- cp = ".rhosts writeable by other than owner";
+ cp = _(".rhosts writeable by other than owner");
/* If there were any problems, quit. */
if (cp) {
__rcmd_errstr = cp;
diff --git a/posix/getconf.c b/posix/getconf.c
index e42b909ed9..7423a77225 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -61,7 +61,7 @@ static CONST char *program;
static void
DEFUN_VOID(usage)
{
- fprintf (stderr, "Usage: %s variable_name [pathname]\n", program);
+ fprintf (stderr, _("Usage: %s variable_name [pathname]\n"), program);
exit (2);
}
@@ -129,6 +129,6 @@ DEFUN(main, (argc, argv), int argc AND char **argv)
}
}
- fprintf (stderr, "%s: Unrecognized variable `%s'\n", program, argv[1]);
+ fprintf (stderr, _("%s: Unrecognized variable `%s'\n"), program, argv[1]);
exit (2);
}
diff --git a/posix/id.c b/posix/id.c
index d886e68573..b08d2501fa 100644
--- a/posix/id.c
+++ b/posix/id.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@ DEFUN(print_grpname, (id, parens),
return;
else
{
- fprintf(stderr, "Couldn't find name for group %d\n", id);
+ fprintf(stderr, _("Couldn't find name for group %d\n"), id);
exit(EXIT_FAILURE);
}
}
@@ -59,7 +59,7 @@ DEFUN(print_pwdname, (id, parens),
return;
else
{
- fprintf(stderr, "Couldn't find name for user %d\n", (int) id);
+ fprintf(stderr, _("Couldn't find name for user %d\n"), (int) id);
exit(EXIT_FAILURE);
}
}
@@ -109,7 +109,7 @@ DEFUN(main, (argc, argv), int argc AND char **argv)
if (error || argc != optind)
{
- fputs("Usage: id [-gurn]\n", stderr);
+ fputs(_("Usage: id [-gurn]\n"), stderr);
exit(EXIT_FAILURE);
}
diff --git a/resolv/herror.c b/resolv/herror.c
index 988e52cbd9..f36126a0bd 100644
--- a/resolv/herror.c
+++ b/resolv/herror.c
@@ -3,7 +3,7 @@
* -
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -19,7 +19,7 @@
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
* SUCH DAMAGE.
* -
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies, and that
* the name of Digital Equipment Corporation not be used in advertising or
* publicity pertaining to distribution of the document or software without
* specific, written prior permission.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -69,11 +69,11 @@ static char rcsid[] = "$Id$";
#endif
const char *h_errlist[] = {
- "Resolver Error 0 (no error)",
- "Unknown host", /* 1 HOST_NOT_FOUND */
- "Host name lookup failure", /* 2 TRY_AGAIN */
- "Unknown server error", /* 3 NO_RECOVERY */
- "No address associated with name", /* 4 NO_ADDRESS */
+ N_("Resolver Error 0 (no error)"),
+ N_("Unknown host"), /* 1 HOST_NOT_FOUND */
+ N_("Host name lookup failure"), /* 2 TRY_AGAIN */
+ N_("Unknown server error"), /* 3 NO_RECOVERY */
+ N_("No address associated with name"), /* 4 NO_ADDRESS */
};
int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
@@ -111,8 +111,8 @@ hstrerror(err)
int err;
{
if (err < 0)
- return ("Resolver internal error");
+ return _("Resolver internal error");
else if (err < h_nerr)
- return (h_errlist[err]);
- return ("Unknown resolver error");
+ return _(h_errlist[err]);
+ return _("Unknown resolver error");
}
diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
index 87ff2b648b..92703fbbc1 100644
--- a/sunrpc/auth_unix.c
+++ b/sunrpc/auth_unix.c
@@ -6,11 +6,11 @@
* may copy or modify Sun RPC without charge, but are not authorized
* to license or distribute it to anyone else except as part of a product or
* program developed by the user.
- *
+ *
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
+ *
* Sun RPC is provided with no support and without any obligation on the
* part of Sun Microsystems, Inc. to assist in its use, correction,
* modification or enhancement.
@@ -18,11 +18,11 @@
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
* OR ANY PART THEREOF.
- *
+ *
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
* or profits or other special, indirect and consequential damages, even if
* Sun has been advised of the possibility of such damages.
- *
+ *
* Sun Microsystems, Inc.
* 2550 Garcia Avenue
* Mountain View, California 94043
@@ -32,8 +32,8 @@ static char sccsid[] = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
#endif
/*
- * auth_unix.c, Implements UNIX style authentication parameters.
- *
+ * auth_unix.c, Implements UNIX style authentication parameters.
+ *
* Copyright (C) 1984, Sun Microsystems, Inc.
*
* The system is very weak. The client uses no encryption for it's
@@ -138,7 +138,7 @@ authunix_create(machname, uid, gid, len, aup_gids)
* Serialize the parameters into origcred
*/
xdrmem_create(&xdrs, mymem, MAX_AUTH_BYTES, XDR_ENCODE);
- if (! xdr_authunix_parms(&xdrs, &aup))
+ if (! xdr_authunix_parms(&xdrs, &aup))
abort();
au->au_origcred.oa_length = len = XDR_GETPOS(&xdrs);
au->au_origcred.oa_flavor = AUTH_UNIX;
@@ -256,7 +256,7 @@ authunix_refresh(auth)
xdrmem_create(&xdrs, au->au_origcred.oa_base,
au->au_origcred.oa_length, XDR_DECODE);
stat = xdr_authunix_parms(&xdrs, &aup);
- if (! stat)
+ if (! stat)
goto done;
/* update the time and serialize in place */
@@ -311,7 +311,7 @@ marshal_new_auth(auth)
xdrmem_create(xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
if ((! xdr_opaque_auth(xdrs, &(auth->ah_cred))) ||
(! xdr_opaque_auth(xdrs, &(auth->ah_verf)))) {
- perror("auth_none.c - Fatal marshalling problem");
+ perror(_("auth_none.c - Fatal marshalling problem"));
} else {
au->au_mpos = XDR_GETPOS(xdrs);
}
diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
index 4a8c084e13..147a5ea23c 100644
--- a/sunrpc/clnt_perr.c
+++ b/sunrpc/clnt_perr.c
@@ -6,23 +6,23 @@
* may copy or modify Sun RPC without charge, but are not authorized
* to license or distribute it to anyone else except as part of a product or
* program developed by the user.
- *
+ *
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
+ *
* Sun RPC is provided with no support and without any obligation on the
* part of Sun Microsystems, Inc. to assist in its use, correction,
* modification or enhancement.
- *
+ *
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
* OR ANY PART THEREOF.
- *
+ *
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
* or profits or other special, indirect and consequential damages, even if
* Sun has been advised of the possibility of such damages.
- *
+ *
* Sun Microsystems, Inc.
* 2550 Garcia Avenue
* Mountain View, California 94043
@@ -78,17 +78,17 @@ clnt_sperror(rpch, s)
return (0);
CLNT_GETERR(rpch, &e);
- (void) sprintf(str, "%s: ", s);
+ (void) sprintf(str, "%s: ", s);
str += strlen(str);
- (void) strcpy(str, clnt_sperrno(e.re_status));
+ (void) strcpy(str, clnt_sperrno(e.re_status));
str += strlen(str);
switch (e.re_status) {
case RPC_SUCCESS:
case RPC_CANTENCODEARGS:
case RPC_CANTDECODERES:
- case RPC_TIMEDOUT:
+ case RPC_TIMEDOUT:
case RPC_PROGUNAVAIL:
case RPC_PROCUNAVAIL:
case RPC_CANTDECODEARGS:
@@ -103,41 +103,41 @@ clnt_sperror(rpch, s)
case RPC_CANTSEND:
case RPC_CANTRECV:
(void) sprintf(str, "; errno = %s",
- sys_errlist[e.re_errno]);
+ sys_errlist[e.re_errno]);
str += strlen(str);
break;
case RPC_VERSMISMATCH:
(void) sprintf(str,
- "; low version = %lu, high version = %lu",
+ _("; low version = %lu, high version = %lu"),
e.re_vers.low, e.re_vers.high);
str += strlen(str);
break;
case RPC_AUTHERROR:
err = auth_errmsg(e.re_why);
- (void) sprintf(str,"; why = ");
+ (void) sprintf(str,_("; why = "));
str += strlen(str);
if (err != NULL) {
(void) sprintf(str, "%s",err);
} else {
(void) sprintf(str,
- "(unknown authentication error - %d)",
+ _("(unknown authentication error - %d)"),
(int) e.re_why);
}
str += strlen(str);
break;
case RPC_PROGVERSMISMATCH:
- (void) sprintf(str,
- "; low version = %lu, high version = %lu",
+ (void) sprintf(str,
+ _("; low version = %lu, high version = %lu"),
e.re_vers.low, e.re_vers.high);
str += strlen(str);
break;
default: /* unknown */
- (void) sprintf(str,
- "; s1 = %lu, s2 = %lu",
+ (void) sprintf(str,
+ "; s1 = %lu, s2 = %lu",
e.re_lb.s1, e.re_lb.s2);
str += strlen(str);
break;
@@ -161,42 +161,42 @@ struct rpc_errtab {
};
static struct rpc_errtab rpc_errlist[] = {
- { RPC_SUCCESS,
- "RPC: Success" },
- { RPC_CANTENCODEARGS,
- "RPC: Can't encode arguments" },
- { RPC_CANTDECODERES,
- "RPC: Can't decode result" },
- { RPC_CANTSEND,
- "RPC: Unable to send" },
- { RPC_CANTRECV,
- "RPC: Unable to receive" },
- { RPC_TIMEDOUT,
- "RPC: Timed out" },
- { RPC_VERSMISMATCH,
- "RPC: Incompatible versions of RPC" },
- { RPC_AUTHERROR,
- "RPC: Authentication error" },
- { RPC_PROGUNAVAIL,
- "RPC: Program unavailable" },
- { RPC_PROGVERSMISMATCH,
- "RPC: Program/version mismatch" },
- { RPC_PROCUNAVAIL,
- "RPC: Procedure unavailable" },
- { RPC_CANTDECODEARGS,
- "RPC: Server can't decode arguments" },
- { RPC_SYSTEMERROR,
- "RPC: Remote system error" },
- { RPC_UNKNOWNHOST,
- "RPC: Unknown host" },
+ { RPC_SUCCESS,
+ N_("RPC: Success") },
+ { RPC_CANTENCODEARGS,
+ N_("RPC: Can't encode arguments") },
+ { RPC_CANTDECODERES,
+ N_("RPC: Can't decode result") },
+ { RPC_CANTSEND,
+ N_("RPC: Unable to send") },
+ { RPC_CANTRECV,
+ N_("RPC: Unable to receive") },
+ { RPC_TIMEDOUT,
+ N_("RPC: Timed out") },
+ { RPC_VERSMISMATCH,
+ N_("RPC: Incompatibl