serial-dmm: Mark serial read/write calls as nonblocking.

[libsigrok.git] / src / session_file.c

diff --git a/src/session_file.c b/src/session_file.c
index 58282ea6a025d5c0669d9e049478cfc6cb3dc94a..9298abefc39e1fd1145d9beea7f60c2370bb995d 100644 (file)
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -46,7 +46,6 @@
  * @{
  */
 
-extern struct sr_session *session;
 extern SR_PRIV struct sr_dev_driver session_driver;
 
 /** @private */
@@ -95,6 +94,11 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
                return SR_ERR;
        }
 
+       if ((ret = zip_close(archive)) == -1) {
+               sr_dbg("error closing zipfile: %s", zip_strerror(archive));
+               return SR_ERR;
+       }
+
        return SR_OK;
 }
 
@@ -102,6 +106,7 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
  * Load the session from the specified filename.
  *
  * @param filename The name of the session file to load. Must not be NULL.
+ * @param session The session to load the file into. Must not be NULL.
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments,
  *         SR_ERR_MALLOC upon memory allocation errors, or SR_ERR upon
@@ -220,6 +225,7 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
 /**
  * Save a session to the specified file.
  *
+ * @param session The session to save to the specified file. Must not be NULL.
  * @param filename The name of the filename to save the session as.
  *                 Must not be NULL.
  * @param sdi The device instance from which the data was captured.
@@ -279,6 +285,7 @@ SR_API int sr_session_save(struct sr_session *session, const char *filename,
 /**
  * Initialize a saved session file.
  *
+ * @param session The session to use. Must not be NULL.
  * @param filename The name of the filename to save the session as.
  *                 Must not be NULL.
  * @param samplerate The samplerate to store for this session.
@@ -375,6 +382,7 @@ SR_API int sr_session_save_init(struct sr_session *session,
  * The session file must have been created with sr_session_save_init()
  * or sr_session_save() beforehand.
  *
+ * @param session The session to use. Must not be NULL.
  * @param filename The name of the filename to append to. Must not be NULL.
  * @param buf The data to be appended.
  * @param unitsize The number of bytes per sample.