summaryrefslogtreecommitdiff
path: root/module/p11-capi-object.h
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2008-12-09 21:56:50 +0000
committerStef Walter <stef@memberwebs.com>2008-12-09 21:56:50 +0000
commitfb9374be05108422a9662217e727b940ef896bf6 (patch)
tree94d427a86793569de3f589d6770bd8821b820b57 /module/p11-capi-object.h
parenta414a5af4b26f039ad7b0a592aca12d2b14b1654 (diff)
Fix copious amounts of debugging messages. Add concept of warning messages.
Diffstat (limited to 'module/p11-capi-object.h')
-rw-r--r--module/p11-capi-object.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/module/p11-capi-object.h b/module/p11-capi-object.h
index e884ee1..c204f17 100644
--- a/module/p11-capi-object.h
+++ b/module/p11-capi-object.h
@@ -22,10 +22,6 @@
#include "p11-capi.h"
-/* Debug print something about an object */
-#define DBGO(obj, msg) \
- p11c_debug("O%d: %s", (obj) ? (obj)->id : 0, (msg))
-
/* A function to load data for an object */
typedef CK_RV (*P11cLoadData)(P11cSession* sess, struct _P11cObject* obj,
P11cObjectData** objdata);
@@ -93,8 +89,13 @@ CK_BBOOL p11c_object_data_match_attr (P11cObjectData* objdata,
CK_RV p11c_object_data_get_attrs (P11cObjectData* objdata, CK_ATTRIBUTE_PTR attrs,
CK_ULONG count);
-/* Debug print something about an object data */
-#define DBGOD(objdata, msg) \
- p11c_debug("O%d: %s", (objdata) ? (objdata)->obj : 0, (msg))
+/* Debug print something about an object or object data */
+#if DBG_OUTPUT
+#define DBGO(obj, msg) p11c_log("O%d: %s", (obj) ? (obj)->id : 0, (msg))
+#define DBGOD(objdata, msg) p11c_log("O%d: %s", (objdata) ? (objdata)->obj : 0, (msg))
+#else
+#define DBGO(obj, msg)
+#define DBGOD(objdata, msg)
+#endif
#endif /* P11C_OBJECT_H */