Do not print line number in debug messages master
authorMatthias Schiffer <mschiffer@universe-factory.net>
Sat, 16 May 2020 21:04:05 +0000 (23:04 +0200)
committerMatthias Schiffer <mschiffer@universe-factory.net>
Sat, 16 May 2020 21:04:05 +0000 (23:04 +0200)
The line number does not add any significant information, and it makes
the unit tests which check for these debug messages very fragile.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
tests/cram/test_ucert.t
ucert.c

index 985740d..d4d57b2 100644 (file)
@@ -57,9 +57,9 @@ check that ucert is producing expected results:
   ---
 
   $ ucert -D -c $TEST_INPUTS/invalid.ucert
-  cert_dump(406): cannot parse cert
+  cert_dump: cannot parse cert
   [1]
 
   $ ucert-san -D -c $TEST_INPUTS/invalid.ucert
-  cert_dump(406): cannot parse cert
+  cert_dump: cannot parse cert
   [1]
diff --git a/ucert.c b/ucert.c
index 24349c4..5523b02 100644 (file)
--- a/ucert.c
+++ b/ucert.c
@@ -49,10 +49,10 @@ static enum {
 
 static bool quiet;
 #ifndef UCERT_STRIP_MESSAGES
-#define DPRINTF(format, ...)                                                                   \
-       do {                                                                                    \
-               if (!quiet)                                                                     \
-                       fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__); \
+#define DPRINTF(format, ...)                                                           \
+       do {                                                                            \
+               if (!quiet)                                                             \
+                       fprintf(stderr, "%s: " format, __func__, ## __VA_ARGS__);       \
        } while (0)
 #else
 #define DPRINTF(format, ...) do { } while (0)