net-tools/net-tools-1.60-strictaliasing.diff

39 lines
1.5 KiB
Diff

Index: net-tools-1.60/lib/masq_info.c
===================================================================
--- net-tools-1.60.orig/lib/masq_info.c
+++ net-tools-1.60/lib/masq_info.c
@@ -98,16 +98,16 @@ static int read_masqinfo(FILE * f, struc
if (has_pdelta) {
if ((n = fscanf(f, " %s %lX:%hX %lX:%hX %hX %lX %hd %hd %lu",
buf,
- (unsigned long *) &ms->src.sin_addr.s_addr, &ms->sport,
- (unsigned long *) &ms->dst.sin_addr.s_addr, &ms->dport,
+ &ms->src.sin_addr.s_addr, &ms->sport,
+ &ms->dst.sin_addr.s_addr, &ms->dport,
&ms->mport, &ms->initseq, &ms->delta,
&ms->pdelta, &ms->expires)) == -1)
return nread;
} else {
if ((n = fscanf(f, " %s %lX:%hX %lX:%hX %hX %lX %hd %lu",
buf,
- (unsigned long *) &ms->src.sin_addr.s_addr, &ms->sport,
- (unsigned long *) &ms->dst.sin_addr.s_addr, &ms->dport,
+ &ms->src.sin_addr.s_addr, &ms->sport,
+ &ms->dst.sin_addr.s_addr, &ms->dport,
&ms->mport, &ms->initseq, &ms->delta,
&ms->expires)) == -1)
return nread;
Index: net-tools-1.60/plipconfig.c
===================================================================
--- net-tools-1.60.orig/plipconfig.c
+++ net-tools-1.60/plipconfig.c
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
spp = argv;
strncpy(ifr.ifr_name, *spp++, IFNAMSIZ);
- plip=(struct plipconf *)&ifr.ifr_data;
+ plip=&ifr.ifr_data;
plip->pcmd = PLIP_GET_TIMEOUT; /* get current settings for device */
if (ioctl(skfd, SIOCDEVPLIP, &ifr) < 0) {