Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net/npf *"" is not constant according to gcc. So we move...



details:   https://anonhg.NetBSD.org/src/rev/03c49721e115
branches:  trunk
changeset: 785391:03c49721e115
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 11 17:03:55 2013 +0000

description:
*"" is not constant according to gcc. So we move the responsibility for adding
a , to the users of the macro.

diffstat:

 sys/net/npf/npf.h               |  4 ++--
 sys/net/npf/npf_ext_log.c       |  6 +++---
 sys/net/npf/npf_ext_normalise.c |  6 +++---
 sys/net/npf/npf_ext_rndblock.c  |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r 6978d40f8027 -r 03c49721e115 sys/net/npf/npf.h
--- a/sys/net/npf/npf.h Mon Mar 11 16:38:31 2013 +0000
+++ b/sys/net/npf/npf.h Mon Mar 11 17:03:55 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf.h,v 1.28 2013/03/11 16:37:43 christos Exp $        */
+/*     $NetBSD: npf.h,v 1.29 2013/03/11 17:03:55 christos Exp $        */
 
 /*-
  * Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
 #define        NPF_DECISION_PASS       1
 
 #define        NPF_EXT_MODULE(name, req)       \
-    MODULE(MODULE_CLASS_MISC, name, req ? ("npf," req) : "npf")
+    MODULE(MODULE_CLASS_MISC, name, "npf" req)
 
 /*
  * Packet information cache.
diff -r 6978d40f8027 -r 03c49721e115 sys/net/npf/npf_ext_log.c
--- a/sys/net/npf/npf_ext_log.c Mon Mar 11 16:38:31 2013 +0000
+++ b/sys/net/npf/npf_ext_log.c Mon Mar 11 17:03:55 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $ */
+/*     $NetBSD: npf_ext_log.c,v 1.6 2013/03/11 17:03:55 christos Exp $ */
 
 /*-
  * Copyright (c) 2010-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.6 2013/03/11 17:03:55 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -51,7 +51,7 @@
 
 #include "npf_impl.h"
 
-NPF_EXT_MODULE(npf_ext_log, NULL);
+NPF_EXT_MODULE(npf_ext_log, "");
 
 #define        NPFEXT_LOG_VER          1
 
diff -r 6978d40f8027 -r 03c49721e115 sys/net/npf/npf_ext_normalise.c
--- a/sys/net/npf/npf_ext_normalise.c   Mon Mar 11 16:38:31 2013 +0000
+++ b/sys/net/npf/npf_ext_normalise.c   Mon Mar 11 17:03:55 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $   */
+/*     $NetBSD: npf_ext_normalise.c,v 1.4 2013/03/11 17:03:55 christos Exp $   */
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.4 2013/03/11 17:03:55 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -44,7 +44,7 @@
 /*
  * NPF extension module definition and the identifier.
  */
-NPF_EXT_MODULE(npf_ext_normalise, NULL);
+NPF_EXT_MODULE(npf_ext_normalise, "");
 
 #define        NPFEXT_NORMALISE_VER    1
 
diff -r 6978d40f8027 -r 03c49721e115 sys/net/npf/npf_ext_rndblock.c
--- a/sys/net/npf/npf_ext_rndblock.c    Mon Mar 11 16:38:31 2013 +0000
+++ b/sys/net/npf/npf_ext_rndblock.c    Mon Mar 11 17:03:55 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $    */
+/*     $NetBSD: npf_ext_rndblock.c,v 1.3 2013/03/11 17:03:55 christos Exp $    */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.3 2013/03/11 17:03:55 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/cprng.h>
@@ -45,7 +45,7 @@
 /*
  * NPF extension module definition and the identifier.
  */
-NPF_EXT_MODULE(npf_ext_rndblock, NULL);
+NPF_EXT_MODULE(npf_ext_rndblock, "");
 
 #define        NPFEXT_RNDBLOCK_VER             1
 



Home | Main Index | Thread Index | Old Index