portability: Use g_strerror() in favor of strerror().

[libsigrok.git] / src / session_file.c

diff --git a/src/session_file.c b/src/session_file.c
index 9a1e316e8fd0411158215d011d9ed91b8d7fc00d..b497aad87ac92e04e0a254eb0352a209b0614bb7 100644 (file)
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -26,8 +26,7 @@
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include "config.h" /* Needed for PACKAGE_VERSION and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -63,7 +62,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;
        }
 
@@ -351,7 +350,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");
@@ -465,7 +464,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;