[DRBD-cvs] user by lars; missing exit after ioctl failure

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : lars
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	drbdadm.h drbdadm_main.c drbdsetup.c 


Log Message:
missing exit after ioctl failure
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm.h,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -3 -r1.1.2.20 -r1.1.2.21
--- drbdadm.h	5 Apr 2004 11:47:01 -0000	1.1.2.20
+++ drbdadm.h	21 Apr 2004 21:36:53 -0000	1.1.2.21
@@ -80,8 +80,6 @@
 
 /* CAUTION: arguments may not have side effects! */
 #define for_each_resource(res,tmp,config) \
-	for (res = (config), tmp = 0;     \
-	     tmp = res? res->next : NULL, res != NULL;\
-	     res = tmp)
+	for (res = (config); res && (tmp = res->next, 1); res = tmp)
 
 #endif
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.43
retrieving revision 1.1.2.44
diff -u -3 -r1.1.2.43 -r1.1.2.44
--- drbdadm_main.c	21 Apr 2004 09:10:20 -0000	1.1.2.43
+++ drbdadm_main.c	21 Apr 2004 21:36:53 -0000	1.1.2.44
@@ -199,7 +199,7 @@
 {
   struct d_resource *res,*t;
   for_each_resource(res,t,config) {
-    printf("%s ",esc(res->name));
+    printf(res==config?"%s":" %s",esc(res->name));
   }
   printf("\n");
 
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/drbdsetup.c,v
retrieving revision 1.54.2.28
retrieving revision 1.54.2.29
diff -u -3 -r1.54.2.28 -r1.54.2.29
--- drbdsetup.c	24 Mar 2004 13:14:07 -0000	1.54.2.28
+++ drbdsetup.c	21 Apr 2004 21:36:53 -0000	1.54.2.29
@@ -383,6 +383,7 @@
   if(err)
     {
       perror("ioctl() failed");
+      exit(20);
     }
 
   if (version != API_VERSION)