resource: Replace ssize_t with gssize to avoid unistd.h

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 34edff8760c33a9575ad224a6763ea350c3a4a41..4b4de2d30e1a9039a9b16777e488d32236fca449 100644 (file)
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -101,7 +101,7 @@ SR_PRIV int ResourceReader::close_callback(struct sr_resource *res,
        return SR_OK;
 }
 
-SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res,
+SR_PRIV gssize ResourceReader::read_callback(const struct sr_resource *res,
                void *buf, size_t count, void *cb_data) noexcept
 {
        try {

diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
index 1db6c7dfecf0cd502ed646266fc46cc5ff62148b..eb7957e5a5a9c6c7737ab5ebd561b7b9b0e8e594 100644 (file)
--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
+++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
@@ -232,7 +232,7 @@ private:
                        const char *name, void *cb_data) noexcept;
        static SR_PRIV int close_callback(struct sr_resource *res,
                        void *cb_data) noexcept;
-       static SR_PRIV ssize_t read_callback(const struct sr_resource *res,
+       static SR_PRIV gssize read_callback(const struct sr_resource *res,
                        void *buf, size_t count, void *cb_data) noexcept;
        friend class Context;
 };

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index ea9d477946fd7ae74a963f77e1dc89dd3c906a0e..6ae3be8f856d2567fe58755d7717f7141c8a3410 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -20,8 +20,6 @@
 #ifndef LIBSIGROK_PROTO_H
 #define LIBSIGROK_PROTO_H
 
-#include <unistd.h>
-
 /**
  * @file
  *
@@ -208,7 +206,7 @@ typedef int (*sr_resource_open_callback)(struct sr_resource *res,
                const char *name, void *cb_data);
 typedef int (*sr_resource_close_callback)(struct sr_resource *res,
                void *cb_data);
-typedef ssize_t (*sr_resource_read_callback)(const struct sr_resource *res,
+typedef gssize (*sr_resource_read_callback)(const struct sr_resource *res,
                void *buf, size_t count, void *cb_data);
 
 SR_API int sr_resource_set_hooks(struct sr_context *ctx,

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index a045b57eada2d24da9d403439213567d7391e3eb..5ada5f99601ea03d01e84418f09de72b98ccc789 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -868,7 +868,7 @@ SR_PRIV int sr_resource_open(struct sr_context *ctx,
                G_GNUC_WARN_UNUSED_RESULT;
 SR_PRIV int sr_resource_close(struct sr_context *ctx,
                struct sr_resource *res);
-SR_PRIV ssize_t sr_resource_read(struct sr_context *ctx,
+SR_PRIV gssize sr_resource_read(struct sr_context *ctx,
                const struct sr_resource *res, void *buf, size_t count)
                G_GNUC_WARN_UNUSED_RESULT;
 SR_PRIV void *sr_resource_load(struct sr_context *ctx, int type,

diff --git a/src/resource.c b/src/resource.c
index 3a63a06aaa5e81c34ffd15cc8b04372b3410c356..b921d93da8df5ecef1849460f2f3df8d8b3aae0e 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -173,7 +173,7 @@ static int resource_close_default(struct sr_resource *res, void *cb_data)
        return SR_OK;
 }
 
-static ssize_t resource_read_default(const struct sr_resource *res,
+static gssize resource_read_default(const struct sr_resource *res,
                void *buf, size_t count, void *cb_data)
 {
        FILE *file;
@@ -186,7 +186,7 @@ static ssize_t resource_read_default(const struct sr_resource *res,
                sr_err("%s: invalid handle.", __func__);
                return SR_ERR_ARG;
        }
-       if (count > SSIZE_MAX) {
+       if (count > G_MAXSSIZE) {
                sr_err("%s: count %zu too large.", __func__, count);
                return SR_ERR_ARG;
        }
@@ -309,10 +309,10 @@ SR_PRIV int sr_resource_close(struct sr_context *ctx, struct sr_resource *res)
  *
  * @private
  */
-SR_PRIV ssize_t sr_resource_read(struct sr_context *ctx,
+SR_PRIV gssize sr_resource_read(struct sr_context *ctx,
                const struct sr_resource *res, void *buf, size_t count)
 {
-       ssize_t n_read;
+       gssize n_read;
 
        n_read = (*ctx->resource_read_cb)(res, buf, count,
                        ctx->resource_cb_data);
@@ -342,7 +342,7 @@ SR_PRIV void *sr_resource_load(struct sr_context *ctx,
        struct sr_resource res;
        void *buf;
        size_t res_size;
-       ssize_t n_read;
+       gssize n_read;
 
        if (sr_resource_open(ctx, &res, type, name) != SR_OK)
                return NULL;