* [PATCH] res_debug.c tweak
@ 2006-05-15 12:00 Jakub Jelinek
2006-05-15 14:43 ` Ulrich Drepper
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2006-05-15 12:00 UTC (permalink / raw)
To: Ulrich Drepper; +Cc: Glibc hackers
Hi!
error array doesn't really need to be writable...
2006-05-15 Jakub Jelinek <jakub@redhat.com>
* res_debug.c (loc_ntoa): Make error const.
--- libc/res_debug.c.jj 2006-05-15 13:49:58.000000000 +0200
+++ libc/res_debug.c 2006-05-15 13:52:22.000000000 +0200
@@ -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);
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] res_debug.c tweak
2006-05-15 12:00 [PATCH] res_debug.c tweak Jakub Jelinek
@ 2006-05-15 14:43 ` Ulrich Drepper
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2006-05-15 14:43 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Glibc hackers
[-- Attachment #1: Type: text/plain, Size: 101 bytes --]
Applied.
--
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 251 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-05-15 14:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-05-15 12:00 [PATCH] res_debug.c tweak Jakub Jelinek
2006-05-15 14:43 ` Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).