summaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-03-13 08:59:47 +0000
committerUlrich Drepper <drepper@redhat.com>2002-03-13 08:59:47 +0000
commit6455d2556c3fdedb3dac163c2b0a11192aaf18d6 (patch)
tree346b418b75772613f7b09e9175c4298c9e32de73 /posix
parentab26a24a1721e03c3fc43b9ee437b0735b875c45 (diff)
downloadglibc-6455d2556c3fdedb3dac163c2b0a11192aaf18d6.tar.gz
Update.
2002-03-13 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/ttyname.c: Comment out definition and use of __ttyname. * posix/regcomp.c (__re_error_msgid): Renamed from re_error_msgid. Define as hidden. (__re_error_msgid_idx): Renamed from re_error_msgid_idx. Define as hidden. Change all users of these variables. * posix/regex_internal.h (__re_error_msgid): Renamed from re_error_msgid. Declare as hidden. (__re_error_msgid_idx): Renamed from re_error_msgid_idx. Declare as hidden. * stdio-common/reg-printf.c (__printf_arginfo_table): Define as hidden. (__printf_function_table): Likewise. * stdio-common/printf-parse.h (__printf_arginfo_table): Declare as hidden. (__printf_function_table): Likewise. * nscd/nscd_proto.h: Declare __nss_not_use_nscd_passwd, __nss_not_use_nscd_group, and __nss_not_use_nscd_hosts as hidden. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Define as hidden. * nss/nsswitch.c: Declare _nss_*_database as hidden. * stdlib/wctomb.c (__no_r_state): Declare as hidden. * stdlib/mbtowc.c (__no_r_state): Define as hidden.
Diffstat (limited to 'posix')
-rw-r--r--posix/regcomp.c18
-rw-r--r--posix/regex_internal.h4
2 files changed, 11 insertions, 11 deletions
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 930e8a61b5..7e3954fdad 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -132,7 +132,7 @@ static bin_tree_t *duplicate_tree (const bin_tree_t *src, re_dfa_t *dfa);
POSIX doesn't require that we do anything for REG_NOERROR,
but why not be nice? */
-const char re_error_msgid[] =
+const char __re_error_msgid[] attribute_hidden =
{
#define REG_NOERROR_IDX 0
gettext_noop ("Success") /* REG_NOERROR */
@@ -186,7 +186,7 @@ const char re_error_msgid[] =
gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
};
-const size_t re_error_msgid_idx[] =
+const size_t __re_error_msgid_idx[] attribute_hidden =
{
REG_NOERROR_IDX,
REG_NOMATCH_IDX,
@@ -241,7 +241,7 @@ re_compile_pattern (pattern, length, bufp)
if (!ret)
return NULL;
- return gettext (re_error_msgid + re_error_msgid_idx[(int) ret]);
+ return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
}
#ifdef _LIBC
weak_alias (__re_compile_pattern, re_compile_pattern)
@@ -483,15 +483,15 @@ regerror (errcode, preg, errbuf, errbuf_size)
size_t msg_size;
if (BE (errcode < 0
- || errcode >= (int) (sizeof (re_error_msgid_idx)
- / sizeof (re_error_msgid_idx[0])), 0))
+ || errcode >= (int) (sizeof (__re_error_msgid_idx)
+ / sizeof (__re_error_msgid_idx[0])), 0))
/* Only error codes returned by the rest of the code should be passed
to this routine. If we are given anything else, or if other regex
code generates an invalid error code, then the program has a bug.
Dump core so we can fix it. */
abort ();
- msg = gettext (re_error_msgid + re_error_msgid_idx[errcode]);
+ msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
msg_size = strlen (msg) + 1; /* Includes the null. */
@@ -623,8 +623,8 @@ re_comp (s)
{
re_comp_buf.fastmap = (char *) malloc (SBC_MAX);
if (re_comp_buf.fastmap == NULL)
- return (char *) gettext (re_error_msgid
- + re_error_msgid_idx[(int) REG_ESPACE]);
+ return (char *) gettext (__re_error_msgid
+ + __re_error_msgid_idx[(int) REG_ESPACE]);
}
/* Since `re_exec' always passes NULL for the `regs' argument, we
@@ -639,7 +639,7 @@ re_comp (s)
return NULL;
/* Yes, we're discarding `const' here if !HAVE_LIBINTL. */
- return (char *) gettext (re_error_msgid + re_error_msgid_idx[(int) ret]);
+ return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
}
#endif /* _REGEX_RE_COMP */
diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index f3ae7e1c64..bb28102cc9 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -39,8 +39,8 @@
# define __mempcpy memcpy
#endif
-extern const char re_error_msgid[];
-extern const size_t re_error_msgid_idx[];
+extern const char __re_error_msgid[] attribute_hidden;
+extern const size_t __re_error_msgid_idx[] attribute_hidden;
/* Number of bits in an unsinged int. */
#define UINT_BITS (sizeof (unsigned int) * BYTE_BITS)