Centralise duplicated logging helper defines.

diff --git a/backend.c b/backend.c
index f290e579fb71d394d0ef7f98a421d8d363bfc826..4e657ac578aa58590a480cc202ca07b460bd5fdd 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -23,6 +23,8 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+#define LOG_PREFIX "backend"
+
 extern struct sr_session *session;
 
 /**

diff --git a/device.c b/device.c
index e5411a45af69ff73efca16448b396bac52552001..87031a9afe5a8326f7e8bc9f3cf33bac520c60f4 100644 (file)
--- a/device.c
+++ b/device.c
@@ -23,14 +23,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "device: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "device"
 
 /**
  * @file

diff --git a/filter.c b/filter.c
index 11610157a45497f18a1d00becae00b90c9a04453..eaf69e5cf1ae3bea19d7744b009430d94edcb523 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "filter: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "filter"
 
 /**
  * @file

diff --git a/hardware/agilent-dmm/agilent-dmm.h b/hardware/agilent-dmm/agilent-dmm.h
index 43fed2406ef00c3409deb73eb4aca5d98b71336f..2277111f62c3d3ecc74f760af40f7b437dbc3799 100644 (file)
--- a/hardware/agilent-dmm/agilent-dmm.h
+++ b/hardware/agilent-dmm/agilent-dmm.h
@@ -20,14 +20,7 @@
 #ifndef LIBSIGROK_HARDWARE_AGILENT_DMM_AGILENT_DMM_H
 #define LIBSIGROK_HARDWARE_AGILENT_DMM_AGILENT_DMM_H
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "agilent-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "agilent-dmm"
 
 #define AGDMM_BUFSIZE  256
 

diff --git a/hardware/alsa/protocol.h b/hardware/alsa/protocol.h
index e844bc740afabed26327654f0deb0c25b5ac5bce..d8688929015b2825cc8d8828ac8024455d9e4aca 100644 (file)
--- a/hardware/alsa/protocol.h
+++ b/hardware/alsa/protocol.h
@@ -28,14 +28,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "alsa: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "alsa"
 
 /** Private, per-device-instance driver context. */
 struct dev_context {

diff --git a/hardware/appa-55ii/protocol.h b/hardware/appa-55ii/protocol.h
index d7c83858b1a73b91e88f4f5257c972fceac15318..38a35564c6051af618fe041b234c90846fbe5481 100644 (file)
--- a/hardware/appa-55ii/protocol.h
+++ b/hardware/appa-55ii/protocol.h
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "appa-55ii: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "appa-55ii"
 
 #define APPA_55II_NUM_PROBES  2
 #define APPA_55II_BUF_SIZE    (4 + 32 + 1)

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 0fbcd936f996de05122aae3e3d7e683600dc5e31..74178b1c7451490e351ce3c5197d8a2ed28aa4bf 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.h
+++ b/hardware/asix-sigma/asix-sigma.h
@@ -22,14 +22,7 @@
 #ifndef LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
 #define LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "asix-sigma: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "asix-sigma"
 
 enum sigma_write_register {
        WRITE_CLOCK_SELECT      = 0,

diff --git a/hardware/brymen-dmm/protocol.h b/hardware/brymen-dmm/protocol.h
index 28bf38f5e33a480c75f81ce8742c57f01e341b66..e6d2e560d66f1b88938a2cf0558ebae5077bb0a4 100644 (file)
--- a/hardware/brymen-dmm/protocol.h
+++ b/hardware/brymen-dmm/protocol.h
@@ -28,14 +28,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "brymen-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "brymen-dmm"
 
 #define DMM_BUFSIZE 256
 

diff --git a/hardware/cem-dt-885x/protocol.h b/hardware/cem-dt-885x/protocol.h
index 85a0ea770d5c04dc158b26f0c518d0327ea9959e..233ef8603876d103e0c403cd23daca8ed3e06303 100644 (file)
--- a/hardware/cem-dt-885x/protocol.h
+++ b/hardware/cem-dt-885x/protocol.h
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "cem-dt-885x: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "cem-dt-885x"
 
 /* When retrieving samples from device memory, group this many
  * together into a sigrok packet. */

diff --git a/hardware/center-3xx/protocol.h b/hardware/center-3xx/protocol.h
index 10179db31cf6bc7f25b98c475b2257e2f942818c..71e2630df238a327b20726f22e544d1b33f84293 100644 (file)
--- a/hardware/center-3xx/protocol.h
+++ b/hardware/center-3xx/protocol.h
@@ -29,14 +29,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "center-3xx: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "center-3xx"
 
 /* Note: When adding entries here, don't forget to update CENTER_DEV_COUNT. */
 enum {

diff --git a/hardware/chronovu-la8/protocol.h b/hardware/chronovu-la8/protocol.h
index 8092655002f21f40ad3f31280d35342ec2da3b64..cd71936c168bdce594eb965fbf1ea65151fb29f5 100644 (file)
--- a/hardware/chronovu-la8/protocol.h
+++ b/hardware/chronovu-la8/protocol.h
@@ -27,14 +27,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "la8: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "la8"
 
 #define USB_VENDOR_ID                  0x0403
 #define USB_DESCRIPTION                        "ChronoVu LA8"

diff --git a/hardware/colead-slm/protocol.h b/hardware/colead-slm/protocol.h
index 1460f4d602193d7abcb6bca0cd2245b53207bdbb..8942ac8558863a1dd5d94169c0a4c7836ded1f9c 100644 (file)
--- a/hardware/colead-slm/protocol.h
+++ b/hardware/colead-slm/protocol.h
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "colead-slm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "colead-slm"
 
 enum {
        IDLE,

diff --git a/hardware/common/dmm/es51922.c b/hardware/common/dmm/es51922.c
index 09563f93610fec812596f516c296fac794706b30..cadd7cb7a284d9bbbe4771d878c1830b534f5c4f 100644 (file)
--- a/hardware/common/dmm/es51922.c
+++ b/hardware/common/dmm/es51922.c
@@ -31,14 +31,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "es51922: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "es51922"
 
 /* Factors for the respective measurement mode (0 means "invalid"). */
 static const float factors[8][8] = {

diff --git a/hardware/common/dmm/es519xx.c b/hardware/common/dmm/es519xx.c
index a3f5efbd1067e2616952d69c3ccd5bfeda9e586f..999422955095ad4d84857c8df75879fca542694e 100644 (file)
--- a/hardware/common/dmm/es519xx.c
+++ b/hardware/common/dmm/es519xx.c
@@ -32,14 +32,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "es519xx: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "es519xx"
 
 /* Factors for the respective measurement mode (0 means "invalid"). */
 static const float factors_2400_11b[8][8] = {

diff --git a/hardware/common/dmm/fs9721.c b/hardware/common/dmm/fs9721.c
index 705da3cc19a47ae6587ee4fea9567dc03a177fdf..9b195d0bc5d479702bef37875bf0d79bc4c19afb 100644 (file)
--- a/hardware/common/dmm/fs9721.c
+++ b/hardware/common/dmm/fs9721.c
@@ -38,14 +38,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "fs9721: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "fs9721"
 
 static int parse_digit(uint8_t b)
 {

diff --git a/hardware/common/dmm/fs9922.c b/hardware/common/dmm/fs9922.c
index 51d3c654dbc7aa7ed9e7efcc2949397699c4f404..c5fd63b8aab11cd1b7bc9cdb0fffe98f4287ea23 100644 (file)
--- a/hardware/common/dmm/fs9922.c
+++ b/hardware/common/dmm/fs9922.c
@@ -29,14 +29,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "fs9922: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "fs9922"
 
 static gboolean flags_valid(const struct fs9922_info *info)
 {

diff --git a/hardware/common/dmm/m2110.c b/hardware/common/dmm/m2110.c
index 9184ab4fa9475114f1e66f815d1ba15cb958d6a9..8a84420f0815b6deebae769d07045b850016fc19 100644 (file)
--- a/hardware/common/dmm/m2110.c
+++ b/hardware/common/dmm/m2110.c
@@ -31,15 +31,6 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "bbcgm-m2110: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
-
 SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf)
 {
        float val;

diff --git a/hardware/common/dmm/metex14.c b/hardware/common/dmm/metex14.c
index 4a37efe0c545577b9eff5bbb33b46c60fd02677c..4e66c97c6ae77edb8820c5d0fd4b3e8ea94a200f 100644 (file)
--- a/hardware/common/dmm/metex14.c
+++ b/hardware/common/dmm/metex14.c
@@ -34,14 +34,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "metex14: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "metex14"
 
 static int parse_value(const uint8_t *buf, float *result)
 {

diff --git a/hardware/common/dmm/rs9lcd.c b/hardware/common/dmm/rs9lcd.c
index 4328aefd910f9c63125051b5fd1348947f06cdf4..4f6b0680e861e373feb3f609efb76637c6471e8a 100644 (file)
--- a/hardware/common/dmm/rs9lcd.c
+++ b/hardware/common/dmm/rs9lcd.c
@@ -35,14 +35,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "rs9lcd: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "rs91lcd"
 
 /* Byte 1 of the packet, and the modes it represents */
 #define IND1_HZ                (1 << 7)

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 476ccb21c46d30a9d304e326792ac83b0c764581..044b4642705458d9c91b4b0c39b5a109a38a24dc 100644 (file)
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -30,14 +30,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "ezusb: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "ezusb"
 
 SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 {

diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c
index 4992b7362a8b76ebf29b83f10caac18fc3b55214..78a06fd1918eed01475f66f14fdd8874ab81467c 100644 (file)
--- a/hardware/common/scpi.c
+++ b/hardware/common/scpi.c
@@ -23,13 +23,7 @@
 #include <glib.h>
 #include <string.h>
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "scpi: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "scpi"
 
 #define SCPI_READ_RETRIES 100
 #define SCPI_READ_RETRY_TIMEOUT 10000

diff --git a/hardware/common/scpi_serial.c b/hardware/common/scpi_serial.c
index 6c5415c5daeb26ea2693359025f7706c3326b97d..dc0996349937a181aef67b71012ed23abe61fddc 100644 (file)
--- a/hardware/common/scpi_serial.c
+++ b/hardware/common/scpi_serial.c
@@ -24,13 +24,7 @@
 #include <glib.h>
 #include <string.h>
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "scpi_serial: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "scpi_serial"
 
 #define SCPI_READ_RETRIES 100
 #define SCPI_READ_RETRY_TIMEOUT 10000

diff --git a/hardware/common/scpi_tcp.c b/hardware/common/scpi_tcp.c
index e457287181868573290e2c9549b9c7a4b1727d37..af2db140661ce99c04d77f79f92872723c4de8c5 100644 (file)
--- a/hardware/common/scpi_tcp.c
+++ b/hardware/common/scpi_tcp.c
@@ -37,13 +37,7 @@
 #endif
 #include <errno.h>
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "scpi_tcp: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "scpi_tcp"
 
 struct scpi_tcp {
        char *address;

diff --git a/hardware/common/scpi_usbtmc.c b/hardware/common/scpi_usbtmc.c
index 9648722c20415c125de663461c95a1d421daea5e..298e3ab52012a7ade0ce810658dddc3c4372c56a 100644 (file)
--- a/hardware/common/scpi_usbtmc.c
+++ b/hardware/common/scpi_usbtmc.c
@@ -26,13 +26,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "scpi_usbtmc: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "scpi_usbtmc"
 
 SR_PRIV int scpi_usbtmc_open(void *priv)
 {

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index 891fd02d3729e43b235f8e1b404ed2642ee8482e..a7376af00dc253f663da44f97d55eb7b655674b7 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "serial: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "serial"
 
 /**
  * Open the specified serial port.

diff --git a/hardware/common/usb.c b/hardware/common/usb.c
index 0de54b90653d86f56bb1d58cf8f890ba6bdc1d2a..6e678fdb401d1d681000fc3a6e273c7374656957 100644 (file)
--- a/hardware/common/usb.c
+++ b/hardware/common/usb.c
@@ -33,14 +33,7 @@
 #define SUBCLASS_USBTMC 0x03
 #define USBTMC_USB488   0x01
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "usb: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "usb"
 
 /**
  * Find USB devices according to a connection string.

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index d4836b89ef92eabd638f4d7811b9809c30619ff6..f5ba2596d06503c012ac62fff7877f5caff4d5bd 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -31,14 +31,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "demo: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "demo"
 
 /* TODO: Number of probes should be configurable. */
 #define NUM_PROBES           8

diff --git a/hardware/fluke-dmm/fluke-dmm.h b/hardware/fluke-dmm/fluke-dmm.h
index f1ec8ce9bbbe221034f71f80ad47553bf1828ca4..4291be06c5183e69a8440f31cf4d3d6da8df4699 100644 (file)
--- a/hardware/fluke-dmm/fluke-dmm.h
+++ b/hardware/fluke-dmm/fluke-dmm.h
@@ -20,14 +20,7 @@
 #ifndef LIBSIGROK_HARDWARE_FLUKE_DMM_FLUKE_DMM_H
 #define LIBSIGROK_HARDWARE_FLUKE_DMM_FLUKE_DMM_H
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "fluke-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "fluke-dmm"
 
 #define FLUKEDMM_BUFSIZE  256
 

diff --git a/hardware/fx2lafw/protocol.h b/hardware/fx2lafw/protocol.h
index 76ef63d57d7eeda8bd9e5b4dd739e1338a10279b..c23db39aadecebb85c02dfe146bb581812dfa598 100644 (file)
--- a/hardware/fx2lafw/protocol.h
+++ b/hardware/fx2lafw/protocol.h
@@ -29,14 +29,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "fx2lafw: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "fx2lafw"
 
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1

diff --git a/hardware/gmc-mh-1x-2x/protocol.h b/hardware/gmc-mh-1x-2x/protocol.h
index e3a4ce429b3c21f09e953a1dd1e5a69ce4e35b62..9d742e3cb692e0a5bb36805cb994b5a534c1475e 100644 (file)
--- a/hardware/gmc-mh-1x-2x/protocol.h
+++ b/hardware/gmc-mh-1x-2x/protocol.h
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "gmc-mh-1x-2x: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "gmc-mh-1x-2x"
 
 #define GMC_BUFSIZE  266
 

diff --git a/hardware/hameg-hmo/protocol.h b/hardware/hameg-hmo/protocol.h
index 370bc0088f5573dc60bc7769c1f5810e71c04236..ffc841283d24f152bd5ed83d2c03788a1f3f4933 100644 (file)
--- a/hardware/hameg-hmo/protocol.h
+++ b/hardware/hameg-hmo/protocol.h
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "hameg-hmo: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "hameg-hmo"
 
 #define MAX_INSTRUMENT_VERSIONS 10
 #define MAX_COMMAND_SIZE 31

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 2c4f4c391c625f14ba7d41827219a5fd1b5a631d..16826db2623c62e152c3f37ef231a8a2e9e8398b 100644 (file)
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -22,14 +22,7 @@
 #ifndef LIBSIGROK_HARDWARE_HANTEK_DSO_DSO_H
 #define LIBSIGROK_HARDWARE_HANTEK_DSO_DSO_H
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "hantek-dso: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "hantek-dso"
 
 #define USB_INTERFACE           0
 #define USB_CONFIGURATION       1

diff --git a/hardware/ikalogic-scanalogic2/protocol.h b/hardware/ikalogic-scanalogic2/protocol.h
index 8324204e03798e9676bc6f0684efd1fa83fe414b..add5dda89553dfcff8b36e40693f4789a5fd8841 100644 (file)
--- a/hardware/ikalogic-scanalogic2/protocol.h
+++ b/hardware/ikalogic-scanalogic2/protocol.h
@@ -27,14 +27,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "ikalogic-scanalogic2: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "ikalogic-scanalogic2"
 
 #define VENDOR_NAME                    "IKALOGIC"
 #define MODEL_NAME                     "Scanalogic-2"

diff --git a/hardware/ikalogic-scanaplus/protocol.h b/hardware/ikalogic-scanaplus/protocol.h
index e736f83870f848ab046e3094f95f93b2903a0693..dd7660daae65305a3ee4e82a650992c6acba0f92 100644 (file)
--- a/hardware/ikalogic-scanaplus/protocol.h
+++ b/hardware/ikalogic-scanaplus/protocol.h
@@ -28,14 +28,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "scanaplus: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "scanaplus"
 
 #define COMPRESSED_BUF_SIZE            (64 * 1024)
 

diff --git a/hardware/kecheng-kc-330b/protocol.h b/hardware/kecheng-kc-330b/protocol.h
index eabda85b8554c476b530af268226c0920513fd6d..09152b9f9b6c0dbd11abc986c7cf4cb41c473a37 100644 (file)
--- a/hardware/kecheng-kc-330b/protocol.h
+++ b/hardware/kecheng-kc-330b/protocol.h
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "kecheng-kc-330b: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "kecheng-kc-330b"
 
 #define EP_IN 0x80 | 1
 #define EP_OUT 2

diff --git a/hardware/lascar-el-usb/protocol.h b/hardware/lascar-el-usb/protocol.h
index 16e826a08a8590e182bca086bb3394b754953146..4386ef4b5214e5c4afe1e16be1ecb25e85be087a 100644 (file)
--- a/hardware/lascar-el-usb/protocol.h
+++ b/hardware/lascar-el-usb/protocol.h
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "lascar-el-usb: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "lascar-el-usb"
 
 #define LASCAR_VENDOR "Lascar"
 #define LASCAR_INTERFACE 0

diff --git a/hardware/link-mso19/protocol.h b/hardware/link-mso19/protocol.h
index e4d7e9995a0079899f17197547f3cecc0f329d9c..854267233c416a53cbcffcb3cf1bba48f106a970 100644 (file)
--- a/hardware/link-mso19/protocol.h
+++ b/hardware/link-mso19/protocol.h
@@ -29,14 +29,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "mso19: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "mso19"
 
 #define USB_VENDOR             "3195"
 #define USB_PRODUCT            "f190"

diff --git a/hardware/mic-985xx/protocol.h b/hardware/mic-985xx/protocol.h
index 5b2efb3a890259aa22fa8e6c678ce24fe82470dc..279cca5be79f3ed195a49d27b6f18a9226671907 100644 (file)
--- a/hardware/mic-985xx/protocol.h
+++ b/hardware/mic-985xx/protocol.h
@@ -28,14 +28,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "mic-985xx: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "mic-985xx"
 
 /* Note: When adding entries here, don't forget to update MIC_DEV_COUNT. */
 enum {

diff --git a/hardware/norma-dmm/protocol.h b/hardware/norma-dmm/protocol.h
index e9a956e31115c19eadc55c946e95ab6f78a1e027..2ed0e250346d4193fdd98ee12b8e7df8b140f195 100644 (file)
--- a/hardware/norma-dmm/protocol.h
+++ b/hardware/norma-dmm/protocol.h
@@ -29,14 +29,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "norma-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "norma-dmm"
 
 #define NMADMM_BUFSIZE  256
 

diff --git a/hardware/openbench-logic-sniffer/protocol.h b/hardware/openbench-logic-sniffer/protocol.h
index b9e16e9c869d9f3cd8692e983a9b7aba002fdb9f..333605eeefd46ef5b6fa3e8d1e57a17e0d38f9a9 100644 (file)
--- a/hardware/openbench-logic-sniffer/protocol.h
+++ b/hardware/openbench-logic-sniffer/protocol.h
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "ols: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "ols"
 
 #define NUM_PROBES             32
 #define NUM_TRIGGER_STAGES     4

diff --git a/hardware/rigol-ds/protocol.h b/hardware/rigol-ds/protocol.h
index 853fbe6e61e19a33a03f421664065cdb91b84012..d1c67fd8af2754e5edb7752c5f386de20abc54c1 100644 (file)
--- a/hardware/rigol-ds/protocol.h
+++ b/hardware/rigol-ds/protocol.h
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "rigol-ds: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "rigol-ds"
 
 #define DS1000_ANALOG_LIVE_WAVEFORM_SIZE 600
 #define DS2000_ANALOG_LIVE_WAVEFORM_SIZE 1400

diff --git a/hardware/saleae-logic16/protocol.h b/hardware/saleae-logic16/protocol.h
index 6faa8b68f91e0ed3e968cfe793888f99234e66b8..db19498a12a19925f063b233a1015b0fdf5b2038 100644 (file)
--- a/hardware/saleae-logic16/protocol.h
+++ b/hardware/saleae-logic16/protocol.h
@@ -27,14 +27,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "saleae-logic16: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "saleae-logic16"
 
 enum voltage_range {
        VOLTAGE_RANGE_UNKNOWN,

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index 57d5ea19d471aeddc401b285ef220617b4bad568..22264573da0b742e1bece4658782a49d12edb6c5 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -20,14 +20,7 @@
 #ifndef LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "serial-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "serial-dmm"
 
 /* Note: When adding entries here, don't forget to update DMM_COUNT. */
 enum {

diff --git a/hardware/teleinfo/protocol.h b/hardware/teleinfo/protocol.h
index 46d2efb31ae04f53babdb9882fecdb15e0156889..f95c50eba16e69ced766a583b762c0b6974c1a32 100644 (file)
--- a/hardware/teleinfo/protocol.h
+++ b/hardware/teleinfo/protocol.h
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "teleinfo: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "teleinfo"
 
 enum optarif {
        OPTARIF_NONE,

diff --git a/hardware/tondaj-sl-814/protocol.h b/hardware/tondaj-sl-814/protocol.h
index 5ff051d50bfd58d35b7d2f39ffec5366f4232d21..027b66dfddce61b60cb3eaee7f58dc2217bbb4ee 100644 (file)
--- a/hardware/tondaj-sl-814/protocol.h
+++ b/hardware/tondaj-sl-814/protocol.h
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "tondaj-sl-814: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "tondaj-sl-814"
 
 /** Private, per-device-instance driver context. */
 struct dev_context {

diff --git a/hardware/uni-t-dmm/protocol.h b/hardware/uni-t-dmm/protocol.h
index ea8a1a4c1e529293d51bbd681203ee511ab4ec6e..a6a8f7186c557d506894531ae275017855bd309b 100644 (file)
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -27,14 +27,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "uni-t-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "uni-t-dmm"
 
 enum {
        TECPEL_DMM_8061,

diff --git a/hardware/uni-t-ut32x/protocol.h b/hardware/uni-t-ut32x/protocol.h
index 42cf01d156266023ac74c085026a99b6878b13c8..8513117cba92edf0e1402951620376dc58430c65 100644 (file)
--- a/hardware/uni-t-ut32x/protocol.h
+++ b/hardware/uni-t-ut32x/protocol.h
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "uni-t-ut32x: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "uni-t-ut32x"
 
 #define DEFAULT_DATA_SOURCE DATA_SOURCE_LIVE
 #define USB_CONN "1a86.e008"

diff --git a/hardware/victor-dmm/protocol.h b/hardware/victor-dmm/protocol.h
index 9253900488f02f5d8da58959cd9fb0581f089260..8f12680314e0a1fe75aa0236eb4177b4a7687f7c 100644 (file)
--- a/hardware/victor-dmm/protocol.h
+++ b/hardware/victor-dmm/protocol.h
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "victor-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "victor-dmm"
 
 #define DMM_DATA_SIZE 14
 

diff --git a/hardware/zeroplus-logic-cube/protocol.h b/hardware/zeroplus-logic-cube/protocol.h
index 64fca8090ca6f2f4bef7d1d797e38171d2c525a6..718dd217ad83f3378b3c8675dc800e415ee213cd 100644 (file)
--- a/hardware/zeroplus-logic-cube/protocol.h
+++ b/hardware/zeroplus-logic-cube/protocol.h
@@ -28,14 +28,7 @@
 #include "libsigrok-internal.h"
 #include "analyzer.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "zeroplus: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "zeroplus"
 
 /* Private, per-device-instance driver context. */
 struct dev_context {

diff --git a/hwdriver.c b/hwdriver.c
index a94acc9ec9f89ae79caf73859e6f6a5e9dd6ed6b..83582ad2310abeb7c3bf9210a6cca41fc7ebf231 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -27,14 +27,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "hwdriver: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "hwdriver"
 
 /**
  * @file

diff --git a/input/binary.c b/input/binary.c
index 70bad29cd7b020e1f40338eb8e318ab7cd38015e..dfeedee7433473ab0be857e83b3dbe3e9382fcc1 100644 (file)
--- a/input/binary.c
+++ b/input/binary.c
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "input/binary: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "input/binary"
 
 #define CHUNKSIZE             (512 * 1024)
 #define DEFAULT_NUM_PROBES    8

diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c
index 0fa21adceb79192738a74affe7b493c558f3d2c0..4c7854272aecea801734d2989c7ae2236ba08996 100644 (file)
--- a/input/chronovu_la8.c
+++ b/input/chronovu_la8.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "input/chronovu-la8: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "input/chronovu-l8"
 
 #define NUM_PACKETS            2048
 #define PACKET_SIZE            4096

diff --git a/input/csv.c b/input/csv.c
index e11c554a1f5c44d24391fa5dce28622bb683ce68..65c6b3f9fd1b691f53ffa7f0479eb35ef03007be 100644 (file)
--- a/input/csv.c
+++ b/input/csv.c
@@ -23,14 +23,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "input/csv: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "input/csv"
 
 /*
  * The CSV input module has the following options:

diff --git a/input/vcd.c b/input/vcd.c
index b10da20be90fcc2667a68092f829a44ba8c54f52..d20d4a64fd0c524566103ec1d1d2fe0a9515c293 100644 (file)
--- a/input/vcd.c
+++ b/input/vcd.c
@@ -63,14 +63,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "input/vcd: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "input/vcd"
 
 #define DEFAULT_NUM_PROBES 8
 #define CHUNKSIZE 1024

diff --git a/input/wav.c b/input/wav.c
index 92f6bfb53c743ae636d41aedcb83f5e20f144965..0106a58670786fde5d5483510571c09928f1ff31 100644 (file)
--- a/input/wav.c
+++ b/input/wav.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "input/wav: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "input/wav"
 
 #define CHUNK_SIZE 4096
 

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 82d6d791c39ff8362ce4a794c5a4abd1c0c5ef76..61978c297911b73a91c4f7bce4f98058d06eadf6 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -162,6 +162,16 @@ SR_PRIV int sr_info(const char *format, ...);
 SR_PRIV int sr_warn(const char *format, ...);
 SR_PRIV int sr_err(const char *format, ...);
 
+/* Message logging helpers with subsystem-specific prefix string. */
+#ifndef NO_LOG_WRAPPERS
+#define sr_log(l, s, args...) sr_log(l, "%s: " s, LOG_PREFIX, ## args)
+#define sr_spew(s, args...) sr_spew("%s: " s, LOG_PREFIX, ## args)
+#define sr_dbg(s, args...) sr_dbg("%s: " s, LOG_PREFIX, ## args)
+#define sr_info(s, args...) sr_info("%s: " s, LOG_PREFIX, ## args)
+#define sr_warn(s, args...) sr_warn("%s: " s, LOG_PREFIX, ## args)
+#define sr_err(s, args...) sr_err("%s: " s, LOG_PREFIX, ## args)
+#endif
+
 /*--- device.c --------------------------------------------------------------*/
 
 SR_PRIV struct sr_probe *sr_probe_new(int index, int type,

diff --git a/log.c b/log.c
index d6b293028b5912d3dbadea0553b8a59ca10a0b97..a4ca4bc5728ee98214e6e75bf8801503e3e8aac7 100644 (file)
--- a/log.c
+++ b/log.c
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include "libsigrok.h"
+#define NO_LOG_WRAPPERS
 #include "libsigrok-internal.h"
 
 /**

diff --git a/output/analog.c b/output/analog.c
index 58341e13c6fdd9db9f8187759403550efda2d7dd..9873a8f5f8e92d461bbe0b44f4dbfc38368d531c 100644 (file)
--- a/output/analog.c
+++ b/output/analog.c
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/analog: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/analog"
 
 struct context {
        int num_enabled_probes;

diff --git a/output/binary.c b/output/binary.c
index 2fd858eb5e3466c53b3ed7bb8dce97cd34373545..dd0cf4744ed6bffeccb6c72cf0b06d1692c99ac6 100644 (file)
--- a/output/binary.c
+++ b/output/binary.c
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/binary: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/binary:"
 
 static int data(struct sr_output *o, const uint8_t *data_in,
                uint64_t length_in, uint8_t **data_out, uint64_t *length_out)

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 54fbfa34804db2736c323600dcf53c2d46c3c1db..47b421d9054df938800c383c0f0617ebec256c12 100644 (file)
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/chronovu-la8: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/chronovu-la8"
 
 struct context {
        unsigned int num_enabled_probes;

diff --git a/output/csv.c b/output/csv.c
index 3eda9bf99a95f62df5a966ff933e1861782dd020..51cc8572145cf925d3d73c6aa00b14d92f758983 100644 (file)
--- a/output/csv.c
+++ b/output/csv.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/csv: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/csv"
 
 struct context {
        unsigned int num_enabled_probes;

diff --git a/output/gnuplot.c b/output/gnuplot.c
index e93556f834b0aebed65a7b8a75f110ae8b99f6ba..29508cefdc62ae20c59e25217ccb2be33570d190 100644 (file)
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/gnuplot: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/gnuplot"
 
 struct context {
        unsigned int num_enabled_probes;

diff --git a/output/ols.c b/output/ols.c
index 3c6e59413776870154bb33a9dc4d415512349c9d..0e220534bf7a18187184a5dceef0ba2bf99a4fc1 100644 (file)
--- a/output/ols.c
+++ b/output/ols.c
@@ -31,14 +31,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/ols: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/ols"
 
 struct context {
        uint64_t samplerate;

diff --git a/output/text/ascii.c b/output/text/ascii.c
index 147ff60e94586abb5df1dae3619898aa11295442..61c5a2ad2db863aceb913b3f668b4dec1cb19b03 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -25,14 +25,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/ascii: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/ascii"
 
 SR_PRIV int init_ascii(struct sr_output *o)
 {

diff --git a/output/text/bits.c b/output/text/bits.c
index e0a9812c94aed21e904dae0b779a3e45d2c8ec2a..ff149650fe9c540789db9a0b5d6c87ef8ddbfadb 100644 (file)
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -25,14 +25,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/bits: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/bits"
 
 SR_PRIV int init_bits(struct sr_output *o)
 {

diff --git a/output/text/hex.c b/output/text/hex.c
index 1c2757cc0e84e3845b4014b4f0aecfa71f452813..e9102608ffb1bfe29bb09996e784ccb56bc42517 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -25,14 +25,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/hex: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/hex"
 
 SR_PRIV int init_hex(struct sr_output *o)
 {

diff --git a/output/text/text.c b/output/text/text.c
index 7263224d1874f65c8df2bac2b3e0066f49dc2571..6856612127c1528f8df3f88380ed7230974584c8 100644 (file)
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -27,14 +27,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/text: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/text"
 
 SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf)
 {

diff --git a/output/vcd.c b/output/vcd.c
index 60ec58c3a9bd67f65623c446c67f40743a138b89..d1526c1b6587e076732b343b07a9c81c692df156 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/vcd: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/vcd"
 
 struct context {
        int num_enabled_probes;

diff --git a/session.c b/session.c
index 9130aa678f6bab62fb0d2a8bff816f3855f56659..e1fb5cfb2bf00df9e600024365acb16a1a00c8ff 100644 (file)
--- a/session.c
+++ b/session.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "session: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "session"
 
 /**
  * @file

diff --git a/session_driver.c b/session_driver.c
index 5041092b4c5e760cc53ce3346c9ba42f6ead3b1b..b023cbc0fc8401449cca2024249ee00d8200c01f 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "virtual-session: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "virtual-session"
 
 /* size of payloads sent across the session bus */
 /** @cond PRIVATE */

diff --git a/session_file.c b/session_file.c
index d720dd599eae866299b987fc5a1c2873b2ceb72f..27e540955ba5d499a5a7d5ee0fd5ef7ec42fe5ce 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -30,14 +30,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "session-file: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "session-file"
 
 /**
  * @file

diff --git a/std.c b/std.c
index b6b6f6c7417667ab28633546e227bbdeec50ff5c..727ee6e98576e4c9c11b999820ad27f5bc3a3b68 100644 (file)
--- a/std.c
+++ b/std.c
@@ -27,6 +27,8 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+#define LOG_PREFIX "std"
+
 /**
  * Standard sr_driver_init() API helper.
  *

diff --git a/strutil.c b/strutil.c
index f8644d72946feb578f5858265f1e017f9dfa529c..40ffc4dc7ccce2895fd1413640f8054e34fb7177 100644 (file)
--- a/strutil.c
+++ b/strutil.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "strutil: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "strutil"
 
 /**
  * @file