From: dtucker <dtucker>
Date: Fri, 5 Nov 2004 09:10:02 +0000 (+0000)
Subject:    - deraadt@cvs.openbsd.org 2004/09/15 18:46:04
X-Git-Tag: V_4_0_P1~146
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/007607ab6960368807233895ec84ed8b5560b0fb

   - deraadt@cvs.openbsd.org 2004/09/15 18:46:04
     [scp.c]
     scratch that do { } while (0) wrapper in this case
---

diff --git a/ChangeLog b/ChangeLog
index 47effe08..3fe61b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
    - mickey@cvs.openbsd.org 2004/09/15 18:42:27
      [sshd.c]
      use less doubles in daemons; markus@ ok
+   - deraadt@cvs.openbsd.org 2004/09/15 18:46:04
+     [scp.c]
+     scratch that do { } while (0) wrapper in this case
 
 20041102
  - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX
diff --git a/scp.c b/scp.c
index ef9eaa1a..69b5fc6d 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.117 2004/08/11 21:44:32 avsm Exp $");
+RCSID("$OpenBSD: scp.c,v 1.118 2004/09/15 18:46:04 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -726,7 +726,7 @@ sink(int argc, char **argv)
 
 #define	atime	tv[0]
 #define	mtime	tv[1]
-#define	SCREWUP(str)	do { why = str; goto screwup; } while (0)
+#define	SCREWUP(str)	{ why = str; goto screwup; }
 
 	setimes = targisdir = 0;
 	mask = umask(0);