summaryrefslogtreecommitdiff
path: root/resolv
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-12-21 09:35:28 +0000
committerJakub Jelinek <jakub@redhat.com>2005-12-21 09:35:28 +0000
commitbaa0a2c9a410a88fcacdf82abc7d21b0c99c7cd3 (patch)
tree23761bbdd386ee804a16e3483d30adb8bc204c3a /resolv
parent2bf037b4e8e189e910a41744d79404b94235ab8b (diff)
Updated to fedora-glibc-20051221T0931
Diffstat (limited to 'resolv')
-rw-r--r--resolv/herror.c4
-rw-r--r--resolv/res_hconf.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/resolv/herror.c b/resolv/herror.c
index a61a3a9a4d..c143cec28c 100644
--- a/resolv/herror.c
+++ b/resolv/herror.c
@@ -64,14 +64,14 @@ static const char rcsid[] = "$BINDId: herror.c,v 8.11 1999/10/13 16:39:39 vixie
#include <libintl.h>
#include <not-cancel.h>
-const char *h_errlist[] = {
+const char *const h_errlist[] = {
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] };
+const int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
/*
* herror --
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 9beb881701..c54b28dadd 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -67,7 +67,7 @@ static const char *arg_trimdomain_list (const char *, int, const char *,
static const char *arg_spoof (const char *, int, const char *, unsigned int);
static const char *arg_bool (const char *, int, const char *, unsigned int);
-static struct cmd
+static const struct cmd
{
const char *name;
const char *(*parse_args) (const char * filename, int line_num,
@@ -114,10 +114,10 @@ arg_service_list (const char *fname, int line_num, const char *args,
const char *start;
size_t len;
size_t i;
- static struct
+ static const struct
{
- const char * name;
- enum Name_Service service;
+ const char name[6];
+ int16_t service;
} svcs[] =
{
{"bind", SERVICE_BIND},
@@ -315,7 +315,7 @@ static void
parse_line (const char *fname, int line_num, const char *str)
{
const char *start;
- struct cmd *c = 0;
+ const struct cmd *c = 0;
size_t len;
size_t i;