Fix up aliasing warnings.

gcc has started complaining about these even if passed -fno-strict-aliasing

5 files changed, 12 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 58b8953..66fc195 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-VERSION=1.28
+VERSION=1.29
 
-CFLAGS = -g -O2 -Werror -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls -fno-strict-aliasing
+CFLAGS = -g -O2 -Werror -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
 LDFLAGS = -Wl,-z,relro,-z,now
-# -Wstrict-overflow=5
 CC = gcc
 
 SHELL = /bin/sh
diff --git a/README b/README
index 2c80909..5252944 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-x86info v1.28            http://www.codemonkey.org.uk/projects/x86info
+x86info v1.29            http://www.codemonkey.org.uk/projects/x86info
 Dave Jones <davej@redhat.com>
 
 Somewhere in the mists of time, there was a program by Phil Karn (KA9Q)
diff --git a/cpuid.c b/cpuid.c
index b772621..290aadd 100644
--- a/cpuid.c
+++ b/cpuid.c
@@ -159,6 +159,7 @@ void cpuid(unsigned int CPU_number, unsigned long long idx,
 	static int nodriver=0;
 	char cpuname[20];
 	unsigned char buffer[CPUID_CHUNK_SIZE];
+	unsigned int *ptr = (unsigned int *)buffer;
 	int fh;
 
 	if (eax != NULL) {
@@ -190,10 +191,10 @@ void cpuid(unsigned int CPU_number, unsigned long long idx,
 			perror(cpuname);
 			exit(EXIT_FAILURE);
 		}
-		if (eax!=0)	*eax = (*(unsigned *)(buffer   ));
-		if (ebx!=0)	*ebx = (*(unsigned *)(buffer+ 4));
-		if (ecx!=0)	*ecx = (*(unsigned *)(buffer+ 8));
-		if (edx!=0)	*edx = (*(unsigned *)(buffer+12));
+		if (eax!=0)	*eax = *(ptr)++;
+		if (ebx!=0)	*ebx = *(ptr)++;
+		if (ecx!=0)	*ecx = *(ptr)++;
+		if (edx!=0)	*edx = *(ptr);
 		if (close(fh) == -1) {
 			perror("close");
 			exit(EXIT_FAILURE);
diff --git a/rdmsr.c b/rdmsr.c
index aab0880..5f2cc10 100644
--- a/rdmsr.c
+++ b/rdmsr.c
@@ -73,6 +73,7 @@ int read_msr(int cpu, unsigned int idx, unsigned long long *val)
 	unsigned long lo, hi;
 	int fh;
 	static int nodriver=0;
+	unsigned long *ptr = (unsigned long *) buffer;
 
 	if (nodriver==1)
 		return 0;
@@ -100,8 +101,8 @@ int read_msr(int cpu, unsigned int idx, unsigned long long *val)
 			return 0;
 		}
 
-		lo = (*(unsigned long *)buffer);
-		hi = (*(unsigned long *)(buffer+4));
+		lo = *(ptr)++;
+		hi = *(ptr);
 		*val = hi;
 		*val = (*val<<32) | lo;
 	}
diff --git a/x86info.c b/x86info.c
index 89350b6..d164409 100644
--- a/x86info.c
+++ b/x86info.c
@@ -169,7 +169,7 @@ int main (int argc, char **argv)
 
 	parse_command_line(argc, argv);
 
-	printf("x86info v1.28.  Dave Jones 2001-2011\n");
+	printf("x86info v1.29beta.  Dave Jones 2001-2011\n");
 	printf("Feedback to <davej@redhat.com>.\n\n");
 
 	if ((HaveCPUID()) == 0) {