This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Ok to commit the appended patch? It gets rid of these warnings: nss_dns/dns-host.c:176: warning: dereferencing type-punned pointer will break strict-aliasing rules nss_dns/dns-host.c:193: warning: dereferencing type-punned pointer will break strict-aliasing rules nss_dns/dns-host.c:311: warning: dereferencing type-punned pointer will break strict-aliasing rules nss_dns/dns-host.c:317: warning: dereferencing type-punned pointer will break strict-aliasing rules nss_dns/dns-network.c:126: warning: dereferencing type-punned pointer will break strict-aliasing rules nss_dns/dns-network.c:196: warning: dereferencing type-punned pointer will break strict-aliasing rules Andreas 2002-12-28 Andreas Jaeger <aj@suse.de> * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyaddr_r): Likewise. (_nss_dns_getnetbyname_r): Likewise. * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr_r): Use union type to avoid strict aliasing problem. (_nss_dns_gethostbyname2_r): Likewise. ============================================================ Index: resolv/nss_dns/dns-host.c --- resolv/nss_dns/dns-host.c 17 Oct 2002 21:48:48 -0000 1.36 +++ resolv/nss_dns/dns-host.c 28 Dec 2002 15:35:11 -0000 @@ -132,7 +132,12 @@ _nss_dns_gethostbyname2_r (const char *n char *buffer, size_t buflen, int *errnop, int *h_errnop) { - querybuf *host_buffer, *orig_host_buffer; + union + { + querybuf *buf; + void *ptr; + } host_buffer; + querybuf *orig_host_buffer; char tmp[NS_MAXDNAME]; int size, type, n; const char *cp; @@ -170,10 +175,10 @@ _nss_dns_gethostbyname2_r (const char *n && (cp = res_hostalias (&_res, name, tmp, sizeof (tmp))) != NULL) name = cp; - host_buffer = orig_host_buffer = (querybuf *) alloca (1024); + host_buffer.buf = orig_host_buffer = (querybuf *) alloca (1024); - n = __libc_res_nsearch (&_res, name, C_IN, type, host_buffer->buf, - 1024, (u_char **) &host_buffer); + n = __libc_res_nsearch (&_res, name, C_IN, type, host_buffer.buf->buf, + 1024, (u_char **) &host_buffer.ptr); if (n < 0) { enum nss_status status = (errno == ECONNREFUSED @@ -188,14 +193,14 @@ _nss_dns_gethostbyname2_r (const char *n by having the RES_USE_INET6 bit in _res.options set, we try another lookup. */ if (af == AF_INET6 && (_res.options & RES_USE_INET6)) - n = __libc_res_nsearch (&_res, name, C_IN, T_A, host_buffer->buf, - host_buffer != orig_host_buffer - ? MAXPACKET : 1024, (u_char **) &host_buffer); + n = __libc_res_nsearch (&_res, name, C_IN, T_A, host_buffer.buf->buf, + host_buffer.buf != orig_host_buffer + ? MAXPACKET : 1024, (u_char **) &host_buffer.ptr); if (n < 0) { - if (host_buffer != orig_host_buffer) - free (host_buffer); + if (host_buffer.buf != orig_host_buffer) + free (host_buffer.buf); return status; } @@ -205,10 +210,10 @@ _nss_dns_gethostbyname2_r (const char *n result->h_length = INADDRSZ;; } - status = getanswer_r (host_buffer, n, name, type, result, buffer, buflen, + status = getanswer_r (host_buffer.buf, n, name, type, result, buffer, buflen, errnop, h_errnop, map); - if (host_buffer != orig_host_buffer) - free (host_buffer); + if (host_buffer.buf != orig_host_buffer) + free (host_buffer.buf); return status; } @@ -247,7 +252,12 @@ _nss_dns_gethostbyaddr_r (const void *ad char *h_addr_ptrs[MAX_NR_ADDRS + 1]; char linebuffer[0]; } *host_data = (struct host_data *) buffer; - querybuf *host_buffer, *orig_host_buffer; + union + { + querybuf *buf; + void *ptr; + } host_buffer; + querybuf *orig_host_buffer; char qbuf[MAXDNAME+1], *qp = NULL; size_t size; int n, status; @@ -305,30 +315,30 @@ _nss_dns_gethostbyaddr_r (const void *ad break; } - host_buffer = orig_host_buffer = (querybuf *) alloca (1024); + host_buffer.buf = orig_host_buffer = (querybuf *) alloca (1024); - n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer->buf, - 1024, (u_char **) &host_buffer); + n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf, + 1024, (u_char **) &host_buffer.ptr); if (n < 0 && af == AF_INET6) { strcpy (qp, "ip6.int"); - n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer->buf, - host_buffer != orig_host_buffer - ? MAXPACKET : 1024, (u_char **) &host_buffer); + n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf, + host_buffer.buf != orig_host_buffer + ? MAXPACKET : 1024, (u_char **) &host_buffer.ptr); } if (n < 0) { *h_errnop = h_errno; __set_errno (olderr); - if (host_buffer != orig_host_buffer) - free (host_buffer); + if (host_buffer.buf != orig_host_buffer) + free (host_buffer.buf); return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND; } - status = getanswer_r (host_buffer, n, qbuf, T_PTR, result, buffer, buflen, + status = getanswer_r (host_buffer.buf, n, qbuf, T_PTR, result, buffer, buflen, errnop, h_errnop, 0 /* XXX */); - if (host_buffer != orig_host_buffer) - free (host_buffer); + if (host_buffer.buf != orig_host_buffer) + free (host_buffer.buf); if (status != NSS_STATUS_SUCCESS) { *h_errnop = h_errno; ============================================================ Index: resolv/nss_dns/dns-network.c --- resolv/nss_dns/dns-network.c 19 Nov 2002 06:40:16 -0000 1.17 +++ resolv/nss_dns/dns-network.c 28 Dec 2002 15:35:11 -0000 @@ -110,7 +110,12 @@ _nss_dns_getnetbyname_r (const char *nam int *herrnop) { /* Return entry for network with NAME. */ - querybuf *net_buffer, *orig_net_buffer; + union + { + querybuf *buf; + void *ptr; + } net_buffer; + querybuf *orig_net_buffer; int anslen; char *qbuf; enum nss_status status; @@ -120,25 +125,25 @@ _nss_dns_getnetbyname_r (const char *nam qbuf = strdupa (name); - net_buffer = orig_net_buffer = (querybuf *) alloca (1024); + net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024); - anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer->buf, - 1024, (u_char **) &net_buffer); + anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf, + 1024, (u_char **) &net_buffer.buf); if (anslen < 0) { /* Nothing found. */ *errnop = errno; - if (net_buffer != orig_net_buffer) - free (net_buffer); + if (net_buffer.buf != orig_net_buffer) + free (net_buffer.buf); return (errno == ECONNREFUSED || errno == EPFNOSUPPORT || errno == EAFNOSUPPORT) ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND; } - status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYNAME); - if (net_buffer != orig_net_buffer) - free (net_buffer); + status = getanswer_r (net_buffer.buf, anslen, result, buffer, buflen, BYNAME); + if (net_buffer.buf != orig_net_buffer) + free (net_buffer.buf); return status; } @@ -150,7 +155,12 @@ _nss_dns_getnetbyaddr_r (uint32_t net, i { /* Return entry for network with NAME. */ enum nss_status status; - querybuf *net_buffer, *orig_net_buffer; + union + { + querybuf *buf; + void *ptr; + } net_buffer; + querybuf *orig_net_buffer; unsigned int net_bytes[4]; char qbuf[MAXDNAME]; int cnt, anslen; @@ -190,26 +200,26 @@ _nss_dns_getnetbyaddr_r (uint32_t net, i break; } - net_buffer = orig_net_buffer = (querybuf *) alloca (1024); + net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024); - anslen = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, net_buffer->buf, - 1024, (u_char **) &net_buffer); + anslen = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf, + 1024, (u_char **) &net_buffer.ptr); if (anslen < 0) { /* Nothing found. */ int err = errno; __set_errno (olderr); - if (net_buffer != orig_net_buffer) - free (net_buffer); + if (net_buffer.buf != orig_net_buffer) + free (net_buffer.buf); return (err == ECONNREFUSED || err == EPFNOSUPPORT || err == EAFNOSUPPORT) ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND; } - status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYADDR); - if (net_buffer != orig_net_buffer) - free (net_buffer); + status = getanswer_r (net_buffer.buf, anslen, result, buffer, buflen, BYADDR); + if (net_buffer.buf != orig_net_buffer) + free (net_buffer.buf); if (status == NSS_STATUS_SUCCESS) { /* Strip trailing zeros. */ -- Andreas Jaeger SuSE Labs aj@suse.de private aj@arthur.inka.de http://www.suse.de/~aj
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |