X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=c40e54fa1a4ffc97be9c88481a19ac00fd2d73ff;hb=7b48d6e104fd461b0c12519b70dbd1c6c72824e1;hp=d983d7a0e65f91902d5b8202a0e93d684c8473ca;hpb=93a04e3be9cdaa276d9e7fe14da053483b567b74;p=libsigrok.git diff --git a/session_file.c b/session_file.c index d983d7a0..c40e54fa 100644 --- a/session_file.c +++ b/session_file.c @@ -60,25 +60,26 @@ SR_API int sr_session_load(const char *filename) } if (!(archive = zip_open(filename, 0, &err))) { - sr_dbg("Failed to open session file: zip error %d", err); + sr_dbg("session file: Failed to open session file: zip " + "error %d", err); return SR_ERR; } /* check "version" */ if (!(zf = zip_fopen(archive, "version", 0))) { - sr_dbg("Not a sigrok session file."); + sr_dbg("session file: Not a sigrok session file."); return SR_ERR; } ret = zip_fread(zf, &c, 1); if (ret != 1 || c != '1') { - sr_dbg("Not a valid sigrok session file."); + sr_dbg("session file: Not a valid sigrok session file."); return SR_ERR; } zip_fclose(zf); /* read "metadata" */ if (zip_stat(archive, "metadata", 0, &zs) == -1) { - sr_dbg("Not a valid sigrok session file."); + sr_dbg("session file: Not a valid sigrok session file."); return SR_ERR; } @@ -93,7 +94,7 @@ SR_API int sr_session_load(const char *filename) kf = g_key_file_new(); if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, NULL)) { - sr_dbg("Failed to parse metadata."); + sr_dbg("session file: Failed to parse metadata."); return SR_ERR; } @@ -195,7 +196,7 @@ int sr_session_save(const char *filename) if (!(versrc = zip_source_buffer(zipfile, version, 1, 0))) return SR_ERR; if (zip_add(zipfile, "version", versrc) == -1) { - sr_info("error saving version into zipfile: %s", + sr_info("session file: error saving version into zipfile: %s", zip_strerror(zipfile)); return SR_ERR; } @@ -276,7 +277,8 @@ int sr_session_save(const char *filename) return SR_ERR; if ((ret = zip_close(zipfile)) == -1) { - sr_info("error saving zipfile: %s", zip_strerror(zipfile)); + sr_info("session file: error saving zipfile: %s", + zip_strerror(zipfile)); return SR_ERR; }