Don't reference SR_PACKAGE_VERSION_STRING directly in output modules.

diff --git a/src/output/ascii.c b/src/output/ascii.c
index 9e04e768502a3e817048b8a7a34780e065c5b3ab..c956b075159df16d82658e683d80a29df3d9923f 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -124,7 +124,7 @@ static GString *gen_header(const struct sr_output *o)
        }
 
        header = g_string_sized_new(512);
-       g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
+       g_string_printf(header, "%s %s\n", PACKAGE_NAME, sr_package_version_string_get());
        num_channels = g_slist_length(o->sdi->channels);
        g_string_append_printf(header, "Acquisition with %d/%d channels",
                        ctx->num_enabled_channels, num_channels);

diff --git a/src/output/bits.c b/src/output/bits.c
index c3f2ef32dc26c53abf916c86b81d4c00eae07bcd..f29d57fa17aae4bb448e987eaf89e9f1da2e4b90 100644 (file)
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -102,7 +102,7 @@ static GString *gen_header(const struct sr_output *o)
        }
 
        header = g_string_sized_new(512);
-       g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
+       g_string_printf(header, "%s %s\n", PACKAGE_NAME, sr_package_version_string_get());
        num_channels = g_slist_length(o->sdi->channels);
        g_string_append_printf(header, "Acquisition with %d/%d channels",
                        ctx->num_enabled_channels, num_channels);

diff --git a/src/output/csv.c b/src/output/csv.c
index 4752658716d1e827731c543411f40fa18893a9ff..1ff4e3a7f7fe2a4d5dbfc433e4329ba6661c35cf 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -252,7 +252,7 @@ static GString *gen_header(const struct sr_output *o,
                g_string_append_printf(header,
                        "%s CSV generated by %s %s\n%s from %s on %s",
                        ctx->comment, PACKAGE_NAME,
-                       SR_PACKAGE_VERSION_STRING, ctx->comment,
+                       sr_package_version_string_get(), ctx->comment,
                        ctx->title, ctime(&hdr->starttime.tv_sec));
 
                /* Columns / channels */

diff --git a/src/output/hex.c b/src/output/hex.c
index a1c09f81b4c4e4abe31f1ed4a13ddc8d877d49ef..e557eb08221d2b0cc1dc0376d79476dcc49e1d17 100644 (file)
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -107,7 +107,7 @@ static GString *gen_header(const struct sr_output *o)
        }
 
        header = g_string_sized_new(512);
-       g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
+       g_string_printf(header, "%s %s\n", PACKAGE_NAME, sr_package_version_string_get());
        num_channels = g_slist_length(o->sdi->channels);
        g_string_append_printf(header, "Acquisition with %d/%d channels",
                        ctx->num_enabled_channels, num_channels);

diff --git a/src/output/srzip.c b/src/output/srzip.c
index 93c43d32eb87bd02e16de1ad21a2673684dc7150..0c5ebf684a6c83ab471e01fe53c43f0e1af695ea 100644 (file)
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -99,7 +99,7 @@ static int zip_create(const struct sr_output *o)
        meta = g_key_file_new();
 
        g_key_file_set_string(meta, "global", "sigrok version",
-                       SR_PACKAGE_VERSION_STRING);
+                       sr_package_version_string_get());
 
        devgroup = "device 1";
 

diff --git a/src/output/vcd.c b/src/output/vcd.c
index f90db498e5710d1d595bfab3c5b27818c7b2d202..561b3ba059fc914583b85c0b01901a5490f62e7f 100644 (file)
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -102,7 +102,7 @@ static GString *gen_header(const struct sr_output *o)
 
        /* generator */
        g_string_append_printf(header, "$version %s %s $end\n",
-                       PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
+                       PACKAGE_NAME, sr_package_version_string_get());
        g_string_append_printf(header, "$comment\n  Acquisition with "
                        "%d/%d channels", ctx->num_enabled_channels, num_channels);