BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't reference SR_PACKAGE_VERSION_STRING directly in output modules.

This commit is contained in:
Martin Ling 2018-09-20 20:42:11 +01:00 committed by Gerhard Sittig
parent 3f34a40268
commit 2868bca35b
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/ascii.c
View File

@ -124,7 +124,7 @@ static GString *gen_header(const struct sr_output *o)
} }
header = g_string_sized_new(512); 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); num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels", g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels); ctx->num_enabled_channels, num_channels);

2
src/output/bits.c
View File

@ -102,7 +102,7 @@ static GString *gen_header(const struct sr_output *o)
} }
header = g_string_sized_new(512); 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); num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels", g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels); ctx->num_enabled_channels, num_channels);

2
src/output/csv.c
View File

@ -252,7 +252,7 @@ static GString *gen_header(const struct sr_output *o,
g_string_append_printf(header, g_string_append_printf(header,
"%s CSV generated by %s %s\n%s from %s on %s", "%s CSV generated by %s %s\n%s from %s on %s",
ctx->comment, PACKAGE_NAME, ctx->comment, PACKAGE_NAME,
SR_PACKAGE_VERSION_STRING, ctx->comment, sr_package_version_string_get(), ctx->comment,
ctx->title, ctime(&hdr->starttime.tv_sec)); ctx->title, ctime(&hdr->starttime.tv_sec));
/* Columns / channels */ /* Columns / channels */

2
src/output/hex.c
View File

@ -107,7 +107,7 @@ static GString *gen_header(const struct sr_output *o)
} }
header = g_string_sized_new(512); 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); num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels", g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels); ctx->num_enabled_channels, num_channels);

2
src/output/srzip.c
View File

@ -99,7 +99,7 @@ static int zip_create(const struct sr_output *o)
meta = g_key_file_new(); meta = g_key_file_new();
g_key_file_set_string(meta, "global", "sigrok version", g_key_file_set_string(meta, "global", "sigrok version",
SR_PACKAGE_VERSION_STRING); sr_package_version_string_get());
devgroup = "device 1"; devgroup = "device 1";

2
src/output/vcd.c
View File

@ -102,7 +102,7 @@ static GString *gen_header(const struct sr_output *o)
/* generator */ /* generator */
g_string_append_printf(header, "$version %s %s $end\n", 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 " g_string_append_printf(header, "$comment\n Acquisition with "
"%d/%d channels", ctx->num_enabled_channels, num_channels); "%d/%d channels", ctx->num_enabled_channels, num_channels);