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

Minor cosmetics.

This commit is contained in:
Uwe Hermann 2017-06-06 12:17:44 +02:00
parent 09b2ca47e6
commit faf6dc4633
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hardware/hantek-6xxx/api.c
View File

@ -824,7 +824,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
devc = sdi->priv; devc = sdi->priv;
devc->dev_state = STOPPING; devc->dev_state = STOPPING;
g_free(devc->sample_buf); devc->sample_buf = NULL; g_free(devc->sample_buf);
devc->sample_buf = NULL;
return SR_OK; return SR_OK;
} }

7
src/output/srzip.c
View File

@ -260,8 +260,11 @@ static int zip_append(const struct sr_output *o, unsigned char *buf,
if (!entry_name || strncmp(entry_name, "logic-1", 7) != 0) if (!entry_name || strncmp(entry_name, "logic-1", 7) != 0)
continue; continue;
if (entry_name[7] == '\0') { if (entry_name[7] == '\0') {
/* This file has no extra chunks, just a single "logic-1". /*
* Rename it to "logic-1-1" * and continue with chunk 2. */ * This file has no extra chunks, just a single
* "logic-1". Rename it to "logic-1-1" and continue
* with chunk 2.
*/
if (zip_rename(archive, i, "logic-1-1") < 0) { if (zip_rename(archive, i, "logic-1-1") < 0) {
sr_err("Failed to rename 'logic-1' to 'logic-1-1': %s", sr_err("Failed to rename 'logic-1' to 'logic-1-1': %s",
zip_strerror(archive)); zip_strerror(archive));