BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resource: Replace ssize_t with gssize to avoid unistd.h

This commit is contained in:
Daniel Elstner 2016-01-04 18:53:30 +01:00 committed by Uwe Hermann
parent c61e208d26
commit 32ba0d8005
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/cxx/classes.cpp
View File

@ -101,7 +101,7 @@ SR_PRIV int ResourceReader::close_callback(struct sr_resource *res,
return SR_OK; 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 void *buf, size_t count, void *cb_data) noexcept
{ {
try { try {

2
bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
View File

@ -232,7 +232,7 @@ private:
const char *name, void *cb_data) noexcept; const char *name, void *cb_data) noexcept;
static SR_PRIV int close_callback(struct sr_resource *res, static SR_PRIV int close_callback(struct sr_resource *res,
void *cb_data) noexcept; 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; void *buf, size_t count, void *cb_data) noexcept;
friend class Context; friend class Context;
}; };

4
include/libsigrok/proto.h
View File

@ -20,8 +20,6 @@
#ifndef LIBSIGROK_PROTO_H #ifndef LIBSIGROK_PROTO_H
#define LIBSIGROK_PROTO_H #define LIBSIGROK_PROTO_H
#include <unistd.h>
/** /**
* @file * @file
* *
@ -208,7 +206,7 @@ typedef int (*sr_resource_open_callback)(struct sr_resource *res,
const char *name, void *cb_data); const char *name, void *cb_data);
typedef int (*sr_resource_close_callback)(struct sr_resource *res, typedef int (*sr_resource_close_callback)(struct sr_resource *res,
void *cb_data); 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); void *buf, size_t count, void *cb_data);
SR_API int sr_resource_set_hooks(struct sr_context *ctx, SR_API int sr_resource_set_hooks(struct sr_context *ctx,

2
src/libsigrok-internal.h
View File

@ -868,7 +868,7 @@ SR_PRIV int sr_resource_open(struct sr_context *ctx,
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
SR_PRIV int sr_resource_close(struct sr_context *ctx, SR_PRIV int sr_resource_close(struct sr_context *ctx,
struct sr_resource *res); 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) const struct sr_resource *res, void *buf, size_t count)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
SR_PRIV void *sr_resource_load(struct sr_context *ctx, int type, SR_PRIV void *sr_resource_load(struct sr_context *ctx, int type,

10
src/resource.c
View File

@ -173,7 +173,7 @@ static int resource_close_default(struct sr_resource *res, void *cb_data)
return SR_OK; 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) void *buf, size_t count, void *cb_data)
{ {
FILE *file; FILE *file;
@ -186,7 +186,7 @@ static ssize_t resource_read_default(const struct sr_resource *res,
sr_err("%s: invalid handle.", __func__); sr_err("%s: invalid handle.", __func__);
return SR_ERR_ARG; return SR_ERR_ARG;
} }
if (count > SSIZE_MAX) { if (count > G_MAXSSIZE) {
sr_err("%s: count %zu too large.", __func__, count); sr_err("%s: count %zu too large.", __func__, count);
return SR_ERR_ARG; return SR_ERR_ARG;
} }
@ -309,10 +309,10 @@ SR_PRIV int sr_resource_close(struct sr_context *ctx, struct sr_resource *res)
* *
* @private * @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) 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, n_read = (*ctx->resource_read_cb)(res, buf, count,
ctx->resource_cb_data); ctx->resource_cb_data);
@ -342,7 +342,7 @@ SR_PRIV void *sr_resource_load(struct sr_context *ctx,
struct sr_resource res; struct sr_resource res;
void *buf; void *buf;
size_t res_size; size_t res_size;
ssize_t n_read; gssize n_read;
if (sr_resource_open(ctx, &res, type, name) != SR_OK) if (sr_resource_open(ctx, &res, type, name) != SR_OK)
return NULL; return NULL;