summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhaval Giani <dhaval@linux.vnet.ibm.com>2009-02-25 13:31:29 +0000
committerDhaval Giani <dhaval@linux.vnet.ibm.com>2009-02-25 13:31:29 +0000
commit40e6bd08857a65ce955c42dcf24d1a87e0318d38 (patch)
treede312cd15bed964278959dbbb6527b3204ea96ed
parent85cc276a3fed46c9064652ddf08500b932ee3f94 (diff)
downloadlibcg-40e6bd08857a65ce955c42dcf24d1a87e0318d38.tar.gz
libcg-40e6bd08857a65ce955c42dcf24d1a87e0318d38.tar.xz
libcg-40e6bd08857a65ce955c42dcf24d1a87e0318d38.zip
libcgroup: Move dbg() to libcgroup-internal.h
From: Jan Safranek <jsafrane@redhat.com> I think dbg() should be in internal header file and not in the public one. The tools get their own definition of dbg() so they don't need to include library private header. dbg() is defined on three places now, it will make more sense when the sources are distributed to different directories. Signed-off-by: Jan Safranek <jsafrane@redhat.com> Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com> git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@342 4f4bb910-9a46-0410-90c8-c897d4f1cd53
-rw-r--r--cgrulesengd.h4
-rw-r--r--libcgroup-internal.h6
-rw-r--r--libcgroup.h6
-rw-r--r--tools-common.h7
4 files changed, 14 insertions, 9 deletions
diff --git a/cgrulesengd.h b/cgrulesengd.h
index f49f79f..1dc5bda 100644
--- a/cgrulesengd.h
+++ b/cgrulesengd.h
@@ -32,9 +32,9 @@ __BEGIN_DECLS
/* A simple macro for printing messages only when CGROUP_DEBUG is defined. */
#ifdef CGROUP_DEBUG
- #define fdbg(a, b...) fprintf(a, b)
+ #define dbg(a...) printf(a)
#else
- #define fdbg(a, b...) do {} while(0)
+ #define dbg(a...) do {} while (0)
#endif /* CGROUP_DEBUG */
/* The following ten macros are all for the Netlink code. */
diff --git a/libcgroup-internal.h b/libcgroup-internal.h
index af5d396..a94f6cd 100644
--- a/libcgroup-internal.h
+++ b/libcgroup-internal.h
@@ -26,6 +26,12 @@ __BEGIN_DECLS
#define CGROUP_BUFFER_LEN (5 * FILENAME_MAX)
+#ifdef CGROUP_DEBUG
+#define dbg(x...) printf(x)
+#else
+#define dbg(x...) do {} while (0)
+#endif
+
struct control_value {
char name[FILENAME_MAX];
char value[CG_VALUE_MAX];
diff --git a/libcgroup.h b/libcgroup.h
index dee4648..08613cf 100644
--- a/libcgroup.h
+++ b/libcgroup.h
@@ -43,12 +43,6 @@ __BEGIN_DECLS
/* Estimated number of groups created */
#define MAX_GROUP_ELEMENTS 128
-#ifdef CGROUP_DEBUG
-#define dbg(x...) printf(x)
-#else
-#define dbg(x...) do {} while(0)
-#endif
-
/*
* NOTE: Wide characters are not supported at the moment. Wide character support
* would require us to use a scanner/parser that can parse beyond ASCII
diff --git a/tools-common.h b/tools-common.h
index cd16804..bb5dd30 100644
--- a/tools-common.h
+++ b/tools-common.h
@@ -19,7 +19,12 @@
#define __TOOLS_COMMON
#include <libcgroup.h>
-#include "libcgroup-internal.h"
+
+#ifdef CGROUP_DEBUG
+#define dbg(x...) printf(x)
+#else
+#define dbg(x...) do {} while (0)
+#endif
/**
* Auxiliary specifier of group, used to store parsed command line options.