X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Foutput%2Fascii.c;h=ba9acf9d5e99fb16cdd9771deb96b6464c3dd980;hb=d53295e69edda62f966488bb6e4c05c1c842c6fe;hp=e50724169ea04a69224c1813c765dad79f4f8092;hpb=3cd4b381744eb88fd4ba32565bd408c33b431629;p=libsigrok.git
diff --git a/src/output/ascii.c b/src/output/ascii.c
index e5072416..ba9acf9d 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -18,10 +18,11 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/hex"
@@ -107,7 +108,7 @@ static GString *gen_header(const struct sr_output *o)
}
header = g_string_sized_new(512);
- g_string_printf(header, "%s\n", PACKAGE_STRING);
+ g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels);
@@ -181,7 +182,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
/* Flush line buffers. */
g_string_append_len(*out, ctx->lines[j]->str, ctx->lines[j]->len);
g_string_append_c(*out, '\n');
- if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) {
+ if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) {
offset = ctx->trigger + ctx->trigger / 8;
g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
ctx->trigger = -1;