All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Breeds <tony@bakeyournoodle.com>
To: kernel-janitors@vger.kernel.org
Subject: [Kernel-janitors] [PATCH 4/5] remove concatenation with
Date: Sat, 27 Mar 2004 05:13:55 +0000	[thread overview]
Message-ID: <20040327051355.GF3445@bakeyournoodle.com> (raw)
In-Reply-To: <20040322052155.GF17221@bakeyournoodle.com>


--------------------------------------------------------------------------------
diff -X dontdiff -purN 2.6.4.clean/net/8021q/vlan.h 2.6.4.kj_func/net/8021q/vlan.h
--- 2.6.4.clean/net/8021q/vlan.h	2004-01-15 17:04:12.000000000 +1100
+++ 2.6.4.kj_func/net/8021q/vlan.h	2004-03-26 14:32:44.000000000 +1100
@@ -19,8 +19,8 @@ I never found it..and the problem seems 
 I'll bet they might prove useful again... --Ben
 
 
-#define VLAN_MEM_DBG(x, y, z) printk(VLAN_DBG __FUNCTION__ ":  "  x, y, z);
-#define VLAN_FMEM_DBG(x, y) printk(VLAN_DBG __FUNCTION__  ":  " x, y);
+#define VLAN_MEM_DBG(x, y, z) printk(VLAN_DBG "%s:  "  x, __FUNCTION__, y, z);
+#define VLAN_FMEM_DBG(x, y) printk(VLAN_DBG "%s:  " x, __FUNCTION__, y);
 */
 
 /* This way they don't do anything! */
diff -X dontdiff -purN 2.6.4.clean/net/8021q/vlanproc.c 2.6.4.kj_func/net/8021q/vlanproc.c
--- 2.6.4.clean/net/8021q/vlanproc.c	2004-01-16 21:13:48.000000000 +1100
+++ 2.6.4.kj_func/net/8021q/vlanproc.c	2004-03-26 14:32:44.000000000 +1100
@@ -220,7 +220,7 @@ int vlan_proc_rem_dev(struct net_device 
 	}
 
 #ifdef VLAN_DEBUG
-	printk(VLAN_DBG __FUNCTION__ ": dev: %p\n", vlandev);
+	printk(VLAN_DBG "%s: dev: %p\n", __FUNCTION__, vlandev);
 #endif
 
 	/** NOTE:  This will consume the memory pointed to by dent, it seems. */
diff -X dontdiff -purN 2.6.4.clean/net/ipv4/netfilter/ip_conntrack_irc.c 2.6.4.kj_func/net/ipv4/netfilter/ip_conntrack_irc.c
--- 2.6.4.clean/net/ipv4/netfilter/ip_conntrack_irc.c	2004-01-16 21:14:43.000000000 +1100
+++ 2.6.4.kj_func/net/ipv4/netfilter/ip_conntrack_irc.c	2004-03-26 14:38:52.000000000 +1100
@@ -60,8 +60,8 @@ DECLARE_LOCK(ip_irc_lock);
 struct module *ip_conntrack_irc = THIS_MODULE;
 
 #if 0
-#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \
-					":" format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
diff -X dontdiff -purN 2.6.4.clean/net/ipv4/netfilter/ip_conntrack_tftp.c 2.6.4.kj_func/net/ipv4/netfilter/ip_conntrack_tftp.c
--- 2.6.4.clean/net/ipv4/netfilter/ip_conntrack_tftp.c	2004-02-19 07:19:23.000000000 +1100
+++ 2.6.4.kj_func/net/ipv4/netfilter/ip_conntrack_tftp.c	2004-03-26 14:38:44.000000000 +1100
@@ -33,8 +33,8 @@ MODULE_PARM_DESC(ports, "port numbers of
 #endif
 
 #if 0
-#define DEBUGP(format, args...) printk(__FILE__ ":" __FUNCTION__ ": " \
-				       format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
diff -X dontdiff -purN 2.6.4.clean/net/ipv4/netfilter/ip_nat_tftp.c 2.6.4.kj_func/net/ipv4/netfilter/ip_nat_tftp.c
--- 2.6.4.clean/net/ipv4/netfilter/ip_nat_tftp.c	2004-02-19 07:19:23.000000000 +1100
+++ 2.6.4.kj_func/net/ipv4/netfilter/ip_nat_tftp.c	2004-03-26 14:38:56.000000000 +1100
@@ -47,8 +47,8 @@ MODULE_PARM_DESC(ports, "port numbers of
 #endif
 
 #if 0
-#define DEBUGP(format, args...) printk(__FILE__ ":" __FUNCTION__ ": " \
-				       format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
diff -X dontdiff -purN 2.6.4.clean/net/ipv4/netfilter/ipt_ULOG.c 2.6.4.kj_func/net/ipv4/netfilter/ipt_ULOG.c
--- 2.6.4.clean/net/ipv4/netfilter/ipt_ULOG.c	2004-02-19 07:19:24.000000000 +1100
+++ 2.6.4.kj_func/net/ipv4/netfilter/ipt_ULOG.c	2004-03-26 14:39:12.000000000 +1100
@@ -64,13 +64,13 @@ MODULE_DESCRIPTION("iptables userspace l
 #define ULOG_MAXNLGROUPS	32		/* numer of nlgroups */
 
 #if 0
-#define DEBUGP(format, args...)	printk(__FILE__ ":" __FUNCTION__ ":" \
-				       format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
 
-#define PRINTR(format, args...) do { if (net_ratelimit()) printk(format, ## args); } while (0)
+#define PRINTR(format, args...) do { if (net_ratelimit()) printk(format , ## args); } while (0)
 
 static unsigned int nlbufsiz = 4096;
 MODULE_PARM(nlbufsiz, "i");
--------------------------------------------------------------------------------
Yours Tony

        linux.conf.au       http://lca2005.linux.org.au/
	Apr 18-23 2005      The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

  parent reply	other threads:[~2004-03-27  5:13 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-03-22  5:35 [Kernel-janitors] [PATCH 2/5] Remove concatenation with Tony Breeds
2004-03-23 18:40 ` Arnd Bergmann
2004-03-27  5:06 ` [Kernel-janitors] [PATCH 0/5] remove " Tony Breeds
2004-03-27  5:11 ` [Kernel-janitors] [PATCH 1/5] " Tony Breeds
2004-03-27  5:12 ` [Kernel-janitors] [PATCH 0/5] " Tony Breeds
2004-03-27  5:12 ` Tony Breeds
2004-03-27  5:13 ` Tony Breeds [this message]
2004-03-27  5:17 ` [Kernel-janitors] [PATCH 5/5] " Tony Breeds
2004-04-01 21:55 ` Randy.Dunlap
2004-04-01 22:24 ` Tony Breeds
2004-04-01 23:00 ` Randy.Dunlap
2004-04-02  0:35 ` Randy.Dunlap
2004-04-04  2:20 ` Tony Breeds
2004-04-04  2:28 ` Randy.Dunlap
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 0/5] " Tony Breeds
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 1/5] " Tony Breeds
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 5/5] " Tony Breeds
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 4/5] " Tony Breeds
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 2/5] " Tony Breeds

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040327051355.GF3445@bakeyournoodle.com \
    --to=tony@bakeyournoodle.com \
    --cc=kernel-janitors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.