X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession_file.c;h=9def98d732efdcb1aef743345627bc6dfd9d4481;hb=83c1dbd9b547edc3f0aec80d7427b14672654d4a;hp=91d4d7775f9f2223e3f4ca58f3259d8fcfa2cbcd;hpb=c72981ac41f3cfc1ae770111fc74a88bc8416a97;p=libsigrok.git
diff --git a/src/session_file.c b/src/session_file.c
index 91d4d777..9def98d7 100644
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -26,8 +27,7 @@
#include
#include
#include
-#include "config.h" /* Needed for PACKAGE_VERSION and others. */
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
/** @cond PRIVATE */
@@ -63,7 +63,7 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
return SR_ERR_ARG;
if (stat(filename, &st) == -1) {
- sr_err("Couldn't stat %s: %s", filename, strerror(errno));
+ sr_err("Couldn't stat %s: %s", filename, g_strerror(errno));
return SR_ERR;
}
@@ -105,6 +105,7 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
/**
* Load the session from the specified filename.
*
+ * @param ctx The context in which to load the session.
* @param filename The name of the session file to load.
* @param session The session to load the file into.
*
@@ -113,7 +114,8 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
* @retval SR_ERR_DATA Malformed session file
* @retval SR_ERR This is not a session file
*/
-SR_API int sr_session_load(const char *filename, struct sr_session **session)
+SR_API int sr_session_load(struct sr_context *ctx, const char *filename,
+ struct sr_session **session)
{
GKeyFile *kf;
GPtrArray *capturefiles;
@@ -151,7 +153,7 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
return SR_ERR;
}
- if ((ret = sr_session_new(session)) != SR_OK)
+ if ((ret = sr_session_new(ctx, session)) != SR_OK)
return ret;
ret = SR_OK;
@@ -349,7 +351,7 @@ SR_API int sr_session_save_init(struct sr_session *session,
close(tmpfile);
meta = g_fopen(metafile, "wb");
fprintf(meta, "[global]\n");
- fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
+ fprintf(meta, "sigrok version = %s\n", SR_PACKAGE_VERSION_STRING);
/* metadata */
fprintf(meta, "[device 1]\n");
@@ -463,7 +465,7 @@ SR_API int sr_session_append(struct sr_session *session, const char *filename,
if ((tmpfile = g_mkstemp(tmpname)) == -1)
return SR_ERR;
if (write(tmpfile, metafile, len) < 0) {
- sr_dbg("Failed to create new metadata: %s", strerror(errno));
+ sr_dbg("Failed to create new metadata: %s", g_strerror(errno));
g_free(metafile);
unlink(tmpname);
return SR_ERR;