- 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 47effe087976bdf1bf4545a84b4798e5960986e3..3fe61b90017c314bc45d4ef0be6dadc8df9a5864 100644 (file)
--- 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 ef9eaa1a41146ecba1fb9a940b342402c2ce1b69..69b5fc6d360f629fe40697a0edc024ed05541bea 100644 (file)
--- 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);