Centralise duplicated logging helper defines.

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index 0e7ad2d8b9befb5995e2b2cedea42019c4f4fe51..27e540955ba5d499a5a7d5ee0fd5ef7ec42fe5ce 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -21,20 +21,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <zip.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "config.h" /* Needed for PACKAGE_VERSION and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "session-file: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "session-file"
 
 /**
  * @file
@@ -54,6 +50,7 @@ extern SR_PRIV struct sr_dev_driver session_driver;
 /** @private */
 SR_PRIV int sr_sessionfile_check(const char *filename)
 {
+       struct stat st;
        struct zip *archive;
        struct zip_file *zf;
        struct zip_stat zs;
@@ -63,6 +60,11 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
        if (!filename)
                return SR_ERR_ARG;
 
+       if (stat(filename, &st) == -1) {
+               sr_err("Couldn't stat %s: %s", filename, strerror(errno));
+               return SR_ERR;
+       }
+
        if (!(archive = zip_open(filename, 0, &ret)))
                /* No logging: this can be used just to check if it's
                 * a sigrok session file or not. */