proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2026-01-27 20:37:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dnet: fix strict aliasing warnings

Browse Source 
Recent gcc doesn't like it when you cast char pointers to uint16_t
pointers and then dereference it.  So use memcpy() instead and let
gcc take care of optimizing things away (when appropriate).  This
should also fix alignment issues on arches where gcc packs the char
pointer tighter than 16bits.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2010-06-09 14:52:41 +00:00 committed by Stephen Hemminger
parent 0156412215
commit 9ec0e899e1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dnet_ntop.c
View File

@ -1,4 +1,5 @@
#include <errno.h>
#include <string.h>
#include <sys/types.h>
#include <netinet/in.h>
@ -35,11 +36,14 @@ static __inline__ int do_digit(char *str, u_int16_t *addr, u_int16_t scale, size
static const char *dnet_ntop1(const struct dn_naddr *dna, char *str, size_t len)
{
u_int16_t addr = dn_ntohs(*(u_int16_t *)dna->a_addr);
u_int16_t area = addr >> 10;
u_int16_t addr, area;
size_t pos = 0;
int started = 0;
memcpy(&addr, dna->a_addr, sizeof(addr));
addr = dn_ntohs(addr);
area = addr >> 10;
if (dna->a_len != 2)
return NULL;

5
lib/dnet_pton.c
View File

@ -1,4 +1,5 @@
#include <errno.h>
#include <string.h>
#include <sys/types.h>
#include <netinet/in.h>
@ -37,6 +38,7 @@ static int dnet_num(const char *src, u_int16_t * dst)
static int dnet_pton1(const char *src, struct dn_naddr *dna)
{
u_int16_t addr;
u_int16_t area = 0;
u_int16_t node = 0;
int pos;
@ -48,7 +50,8 @@ static int dnet_pton1(const char *src, struct dn_naddr *dna)
if ((pos == 0) || (node > 1023))
return 0;
dna->a_len = 2;
*(u_int16_t *)dna->a_addr = dn_htons((area << 10) | node);
addr = dn_htons((area << 10) | node);
memcpy(dna->a_addr, &addr, sizeof(addr));
return 1;
}