X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttngerr.h;h=062908098f0f757543deb904de9c482ba3cbecdb;hp=1feb6cc4ded1ba9ad9e7fb7a04db46cb43790449;hb=532d79a74ed67913120fc339c2bff925cc6ab2bc;hpb=d738ac165d7faedb9df991ed72c9a255d9fec5f3

diff --git a/include/lttngerr.h b/include/lttngerr.h
index 1feb6cc4d..062908098 100644
--- a/include/lttngerr.h
+++ b/include/lttngerr.h
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,6 +22,10 @@
 #include <errno.h>
 #include <stdio.h>
 
+/* Stringify the expansion of a define */
+#define XSTR(d) STR(d)
+#define STR(s) #s
+
 extern int opt_quiet;
 extern int opt_verbose;
 
@@ -54,6 +58,6 @@ enum __lttng_print_type {
 #define ERR(fmt, args...) __lttng_print(PRINT_ERR, "Error: " fmt "\n", ## args)
 #define WARN(fmt, args...) __lttng_print(PRINT_WARN, "Warning: " fmt "\n", ## args)
 #define BUG(fmt, args...) __lttng_print(PRINT_BUG, "BUG: " fmt "\n", ## args)
-#define DBG(fmt, args...) __lttng_print(PRINT_DBG, "DEBUG: " fmt "\n", ## args)
+#define DBG(fmt, args...) __lttng_print(PRINT_DBG, "DEBUG: " fmt " [in %s() at " __FILE__ ":" XSTR(__LINE__) "]\n", ## args, __func__)
 
 #endif /* _LTTNGERR_H */