X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sigrok-cli.c;h=64406009e8f43da5ce75236e1959b415c3f84efa;hb=4d16724058cbc97eac0f1a9e32322150777a7323;hp=ab131965d93ab0f7c50204d7f0a121838645bfd1;hpb=4359a4da174e7aa3d2f24c4fcdb3816a3ba8e1a9;p=sigrok-cli.git

diff --git a/sigrok-cli.c b/sigrok-cli.c
index ab13196..6440600 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -94,6 +94,11 @@ static void show_version(void)
 
 	printf("sigrok-cli %s\n\n", VERSION);
 
+	printf("Using libsigrok %s (lib version %s).\n",
+	       sr_package_version_string_get(), sr_lib_version_string_get());
+	printf("Using libsigrokdecode %s (lib version %s).\n\n",
+	       srd_package_version_string_get(), srd_lib_version_string_get());
+
 	printf("Supported hardware drivers:\n");
 	drivers = sr_driver_list();
 	for (i = 0; drivers[i]; i++) {
@@ -292,7 +297,7 @@ static void show_pd_detail(void)
 static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 {
 	static struct sr_output *o = NULL;
-	static int probelist[SR_MAX_NUM_PROBES] = { 0 };
+	static int probelist[SR_MAX_NUM_PROBES + 1] = { 0 };
 	static uint64_t received_samples = 0;
 	static int unitsize = 0;
 	static int triggered = 0;
@@ -302,7 +307,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 	struct sr_datafeed_logic *logic;
 	int num_enabled_probes, sample_size, ret, i;
 	uint64_t output_len, filter_out_len;
-	char *output_buf, *filter_out;
+	uint8_t *output_buf, *filter_out;
 
 	/* If the first packet to come in isn't a header, don't even try. */
 	if (packet->type != SR_DF_HEADER && o == NULL)