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

sr file format: Bump version to 2. 

The *.sr (libsigrok session) file format has changed since the last
libsigrok release. Frontends using older libsigrok versions will not
be able to read *.sr files created by frontends using the new file format.

Thus, bump the version number of the file format to 2.

Current libsigrok will read both version 1 and version 2 files
correctly, and always write version 2 files.
This commit is contained in:
Uwe Hermann 2014-01-23 22:45:08 +01:00
parent fe0d9caa88
commit 3a84104080
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
session_file.c
View File

@ -81,10 +81,11 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
zip_fclose(zf); zip_fclose(zf);
s[ret] = 0; s[ret] = 0;
version = strtoull(s, NULL, 10); version = strtoull(s, NULL, 10);
if (version != 1) { if (version > 2) {
sr_dbg("Cannot handle sigrok session file version %d.", version); sr_dbg("Cannot handle sigrok session file version %d.", version);
return SR_ERR; return SR_ERR;
} }
sr_spew("Detected sigrok session file version %d.", version);
/* read "metadata" */ /* read "metadata" */
if (zip_stat(archive, "metadata", 0, &zs) == -1) { if (zip_stat(archive, "metadata", 0, &zs) == -1) {
@ -304,7 +305,7 @@ SR_API int sr_session_save_init(const char *filename, uint64_t samplerate,
return SR_ERR; return SR_ERR;
/* "version" */ /* "version" */
version[0] = '1'; version[0] = '2';
if (!(versrc = zip_source_buffer(zipfile, version, 1, 0))) if (!(versrc = zip_source_buffer(zipfile, version, 1, 0)))
return SR_ERR; return SR_ERR;
if (zip_add(zipfile, "version", versrc) == -1) { if (zip_add(zipfile, "version", versrc) == -1) {