about summary refs log tree commit diff
path: root/resolv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-05-15 14:42:59 +0000
committerUlrich Drepper <drepper@redhat.com>2006-05-15 14:42:59 +0000
commit4442d58f1f4228584f22eb2fa04ff2334407382a (patch)
tree6ab17cbfe8077e3d6b573a64383b020ca20c06fe /resolv
parent5d3fd1f6417f6775557183a3992209237d5539e9 (diff)
downloadglibc-4442d58f1f4228584f22eb2fa04ff2334407382a.tar.gz
glibc-4442d58f1f4228584f22eb2fa04ff2334407382a.tar.xz
glibc-4442d58f1f4228584f22eb2fa04ff2334407382a.zip
* resolv/res_debug.c (loc_ntoa): Make error const.
2006-05-14  Andreas Schwab  <schwab@suse.de>

	* math/complex.h [__LDBL_COMPAT]: Use __REDIRECT_NTH.

2006-05-12  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/sched_getaffinity.c: Include sys/param.h.
	(__sched_getaffinity_new): Don't crash if cpusetsize is smaller than
	sizeof (cpu_set_t).
Diffstat (limited to 'resolv')
-rw-r--r--resolv/res_debug.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 32ac829730..d9f1607df6 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -896,7 +896,7 @@ loc_ntoa(binary, ascii)
 	const u_char *binary;
 	char *ascii;
 {
-	static char error[] = "?";
+	static const char error[] = "?";
 	static char tmpbuf[sizeof
 "1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];
 	const u_char *cp = binary;
@@ -976,11 +976,11 @@ loc_ntoa(binary, ascii)
 	altmeters = (altval / 100) * altsign;
 
 	if ((sizestr = strdup(precsize_ntoa(sizeval))) == NULL)
-		sizestr = error;
+		sizestr = (char *) error;
 	if ((hpstr = strdup(precsize_ntoa(hpval))) == NULL)
-		hpstr = error;
+		hpstr = (char *) error;
 	if ((vpstr = strdup(precsize_ntoa(vpval))) == NULL)
-		vpstr = error;
+		vpstr = (char *) error;
 
 	sprintf(ascii,
 	      "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %d.%.2dm %sm %sm %sm",
@@ -988,11 +988,11 @@ loc_ntoa(binary, ascii)
 		longdeg, longmin, longsec, longsecfrac, eastwest,
 		altmeters, altfrac, sizestr, hpstr, vpstr);
 
-	if (sizestr != error)
+	if (sizestr != (char *) error)
 		free(sizestr);
-	if (hpstr != error)
+	if (hpstr != (char *) error)
 		free(hpstr);
-	if (vpstr != error)
+	if (vpstr != (char *) error)
 		free(vpstr);
 
 	return (ascii);