[DRBD-cvs] svn commit by lars - r2547 - trunk/user - sorry for the last commit... this is the the better fix

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2006-10-18 22:50:49 +0200 (Wed, 18 Oct 2006)
New Revision: 2547

Modified:
   trunk/user/Makefile
   trunk/user/drbdmeta.c
   trunk/user/drbdsetup.c
Log:
sorry for the last commit...
this is the the better fix, and even fixes an other bogus compiler warning.


Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile	2006-10-18 20:32:29 UTC (rev 2546)
+++ trunk/user/Makefile	2006-10-18 20:50:49 UTC (rev 2547)
@@ -23,6 +23,7 @@
 CFLAGS = -g -O2 -c -W -Wall -I../drbd
 # for the netlink connector stuff <linux/connector.h>:
 drbdsetup: CFLAGS += -I$(KDIR)/include
+drbdsetup drbdmeta: CFLAGS += -fno-strict-aliasing
 
 drbdadm-obj = drbdadm_scanner.o drbdadm_parser.o drbdadm_main.o \
 	      drbdadm_adjust.o drbdtool_common.o drbdadm_usage_cnt.o \

Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c	2006-10-18 20:32:29 UTC (rev 2546)
+++ trunk/user/drbdmeta.c	2006-10-18 20:50:49 UTC (rev 2547)
@@ -2024,13 +2024,15 @@
 /* FIXME add more detection magic
  */
 
+	(void)(
 	may_be_swap     (data,&f) ||
 	may_be_LVM      (data,&f) ||
 
 	may_be_extX     (data,&f) ||
 	may_be_xfs      (data,&f) ||
 	may_be_jfs      (data,&f) ||
-	may_be_reiserfs (data,&f);
+	may_be_reiserfs (data,&f)
+	);
 
 	printf("\nFound %s ", f.type);
 	if (f.bnum) {

Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c	2006-10-18 20:32:29 UTC (rev 2546)
+++ trunk/user/drbdsetup.c	2006-10-18 20:50:49 UTC (rev 2547)
@@ -1072,7 +1072,7 @@
 	int flags;
 	unsigned int len;
 
-	if(!consume_tag_blob(T_uuids,rtl,(void *) &uuids,&len)) {
+	if(!consume_tag_blob(T_uuids,rtl,(char **) &uuids,&len)) {
 		fprintf(stderr,"Reply payload did not carry an uuid-tag,\n"
 			"Probabely the device has no disk!\n");
 		return 1;