[src/trunk]: src/dist/dhcp/dst rather than adding braces in the code, define ...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4044ba7b9d74
branches:  trunk
changeset: 751167:4044ba7b9d74
user:      drochner <drochner%NetBSD.org@localhost>
date:      Tue Jan 26 19:11:00 2010 +0000

description:
rather than adding braces in the code, define the offending macro
to "(void)0". This is what similar code in bind9 (up to 9.5) does.
(native NetBSD code usually does "do { } while (/* CONSTCOND */ 0)"
in this case)
Anyway, I've checked the code, didn't find ambiguities due to
the empty statements, so the whole thing is harmless.

diffstat:

 dist/dhcp/dst/dst_api.c      |  11 ++++-------
 dist/dhcp/dst/dst_internal.h |   2 +-
 dist/dhcp/dst/prandom.c      |   5 ++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diffs (80 lines):

diff -r ef286fd7613b -r 4044ba7b9d74 dist/dhcp/dst/dst_api.c
--- a/dist/dhcp/dst/dst_api.c   Tue Jan 26 18:09:07 2010 +0000
+++ b/dist/dhcp/dst/dst_api.c   Tue Jan 26 19:11:00 2010 +0000
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/Attic/dst_api.c,v 1.6 2010/01/25 20:33:57 drochner Exp $";
+static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/Attic/dst_api.c,v 1.7 2010/01/26 19:11:00 drochner Exp $";
 #endif
 
 /*
@@ -684,10 +684,9 @@
                if (key_st->dk_func->from_dns_key(key_st, &rdata[start],
                                                  len - start) > 0)
                        return (key_st);
-       } else {
+       } else
                EREPORT(("dst_dnskey_to_public_key(): unsuppored alg %d\n",
                         alg));
-       }
 
        SAFE_FREE(key_st);
        return (key_st);
@@ -746,10 +745,9 @@
                        return (enc_len + loc);
                else
                        return (-1);
-       } else {
+       } else
                EREPORT(("dst_key_to_dnskey(): Unsupported ALG %d\n",
                         key->dk_alg));
-       }
        return (-1);
 }
 
@@ -879,11 +877,10 @@
                EREPORT(("dst_s_read_private_key_file(): Unknown keyfile %d.%d version for %s\n",
                         file_major, file_minor, name));
                goto fail;
-       } else if (file_major > major || file_minor > minor) {
+       } else if (file_major > major || file_minor > minor)
                EREPORT((
                                "dst_s_read_private_key_file(): Keyfile %s version higher than mine %d.%d MAY FAIL\n",
                                name, file_major, file_minor));
-       }
 
        while (*p++ != '\n') ;  /* skip to end of line */
 
diff -r ef286fd7613b -r 4044ba7b9d74 dist/dhcp/dst/dst_internal.h
--- a/dist/dhcp/dst/dst_internal.h      Tue Jan 26 18:09:07 2010 +0000
+++ b/dist/dhcp/dst/dst_internal.h      Tue Jan 26 19:11:00 2010 +0000
@@ -60,7 +60,7 @@
 #ifdef REPORT_ERRORS
 #define EREPORT(str)           printf str
 #else
-#define EREPORT(str)
+#define EREPORT(str)           (void)0
 #endif
 
 /* use our own special macro to FRRE memory */
diff -r ef286fd7613b -r 4044ba7b9d74 dist/dhcp/dst/prandom.c
--- a/dist/dhcp/dst/prandom.c   Tue Jan 26 18:09:07 2010 +0000
+++ b/dist/dhcp/dst/prandom.c   Tue Jan 26 19:11:00 2010 +0000
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/Attic/prandom.c,v 1.5 2010/01/25 20:33:57 drochner Exp $";
+static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/Attic/prandom.c,v 1.6 2010/01/26 19:11:00 drochner Exp $";
 #endif
 /*
  * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -850,9 +850,8 @@
                i = dst_sign_data(SIG_MODE_ALL, my_key, NULL, 
                                  (u_char *) counter, hb_size,
                                  semi_old, sizeof(semi_old));
-               if (i != hb_size) {
+               if (i != hb_size)
                        EREPORT(("HMAC SIGNATURE FAILURE %d\n", i));
-               }
                cnt++;
                if (size - out < i)     /* Not all data is needed */
                        semi_loc = i = size - out;