aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-10-16 14:21:20 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2013-10-16 14:21:20 +0200
commit5117eff6f938a6daa269f965a52abc93b49d90d6 (patch)
treee0cd5ec91a93da075184310cd51f35f11744f453
parenteba5faec67da1c95cf9616b5deacbea24fbd3998 (diff)
downloadbusybox-w32-5117eff6f938a6daa269f965a52abc93b49d90d6.tar.gz
busybox-w32-5117eff6f938a6daa269f965a52abc93b49d90d6.tar.bz2
busybox-w32-5117eff6f938a6daa269f965a52abc93b49d90d6.zip
Fix some compiler warnings emitted by gcc-4.8.0
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/libarchive/bz/compress.c12
-rw-r--r--archival/libarchive/lzo1x_9x.c2
-rw-r--r--debianutils/run_parts.c2
-rw-r--r--networking/ping.c2
4 files changed, 9 insertions, 9 deletions
diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
index e9f1afdaf..a7dd72d9e 100644
--- a/archival/libarchive/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -501,14 +501,14 @@ void sendMTFValues(EState* s)
501 for (i = 0; i < 16; i++) { 501 for (i = 0; i < 16; i++) {
502 if (sizeof(long) <= 4) { 502 if (sizeof(long) <= 4) {
503 inUse16 = inUse16*2 + 503 inUse16 = inUse16*2 +
504 ((*(uint32_t*)&(s->inUse[i * 16 + 0]) 504 ((*(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 0])
505 | *(uint32_t*)&(s->inUse[i * 16 + 4]) 505 | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 4])
506 | *(uint32_t*)&(s->inUse[i * 16 + 8]) 506 | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 8])
507 | *(uint32_t*)&(s->inUse[i * 16 + 12])) != 0); 507 | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
508 } else { /* Our CPU can do better */ 508 } else { /* Our CPU can do better */
509 inUse16 = inUse16*2 + 509 inUse16 = inUse16*2 +
510 ((*(uint64_t*)&(s->inUse[i * 16 + 0]) 510 ((*(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 0])
511 | *(uint64_t*)&(s->inUse[i * 16 + 8])) != 0); 511 | *(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
512 } 512 }
513 } 513 }
514 514
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 897132987..3e331984d 100644
--- a/archival/libarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
@@ -94,7 +94,7 @@ typedef struct {
94 ( ((0x9f5f * ((((b[p]<<5)^b[p+1])<<5) ^ b[p+2])) >> 5) & (SWD_HSIZE-1) ) 94 ( ((0x9f5f * ((((b[p]<<5)^b[p+1])<<5) ^ b[p+2])) >> 5) & (SWD_HSIZE-1) )
95 95
96#if defined(LZO_UNALIGNED_OK_2) 96#if defined(LZO_UNALIGNED_OK_2)
97# define HEAD2(b,p) (* (uint16_t *) &(b[p])) 97# define HEAD2(b,p) (* (bb__aliased_uint16_t *) &(b[p]))
98#else 98#else
99# define HEAD2(b,p) (b[p] ^ ((unsigned)b[p+1]<<8)) 99# define HEAD2(b,p) (b[p] ^ ((unsigned)b[p+1]<<8))
100#endif 100#endif
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 2c2b032be..527fae227 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -59,7 +59,7 @@
59struct globals { 59struct globals {
60 char **names; 60 char **names;
61 int cur; 61 int cur;
62 char *cmd[1]; 62 char *cmd[2 /* using 1 provokes compiler warning */];
63} FIX_ALIASING; 63} FIX_ALIASING;
64#define G (*(struct globals*)&bb_common_bufsiz1) 64#define G (*(struct globals*)&bb_common_bufsiz1)
65#define names (G.names) 65#define names (G.names)
diff --git a/networking/ping.c b/networking/ping.c
index f27e2143d..5e4771f5a 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -516,7 +516,7 @@ static void sendping6(int junk UNUSED_PARAM)
516 pkt->icmp6_id = myid; 516 pkt->icmp6_id = myid;
517 517
518 /*if (datalen >= 4)*/ 518 /*if (datalen >= 4)*/
519 *(uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us(); 519 *(bb__aliased_uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us();
520 520
521 //TODO? pkt->icmp_cksum = inet_cksum(...); 521 //TODO? pkt->icmp_cksum = inet_cksum(...);
522 522