X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fresource.c;h=634159308ef5c057a51447e4327cc8d93c005065;hb=6b21d9a77e58bb9586491ba17968a9edb5a8df93;hp=b921d93da8df5ecef1849460f2f3df8d8b3aae0e;hpb=32ba0d80054df01767ec323c621ab1c6bc5f310c;p=libsigrok.git diff --git a/src/resource.c b/src/resource.c index b921d93d..63415930 100644 --- a/src/resource.c +++ b/src/resource.c @@ -135,7 +135,7 @@ static int resource_open_default(struct sr_resource *res, file = try_open_file(*datadirs++, subdir, name); } if (!file) { - sr_err("Failed to locate '%s'.", name); + sr_dbg("Failed to locate '%s'.", name); return SR_ERR; } @@ -224,15 +224,15 @@ SR_API int sr_resource_set_hooks(struct sr_context *ctx, return SR_ERR_ARG; } if (open_cb && close_cb && read_cb) { - ctx->resource_open_cb = open_cb; + ctx->resource_open_cb = open_cb; ctx->resource_close_cb = close_cb; - ctx->resource_read_cb = read_cb; - ctx->resource_cb_data = cb_data; + ctx->resource_read_cb = read_cb; + ctx->resource_cb_data = cb_data; } else if (!open_cb && !close_cb && !read_cb) { - ctx->resource_open_cb = &resource_open_default; + ctx->resource_open_cb = &resource_open_default; ctx->resource_close_cb = &resource_close_default; - ctx->resource_read_cb = &resource_read_default; - ctx->resource_cb_data = ctx; + ctx->resource_read_cb = &resource_read_default; + ctx->resource_cb_data = ctx; } else { sr_err("%s: inconsistent callback pointers.", __func__); return SR_ERR_ARG; @@ -266,7 +266,8 @@ SR_PRIV int sr_resource_open(struct sr_context *ctx, ret = (*ctx->resource_open_cb)(res, name, ctx->resource_cb_data); if (ret != SR_OK) - sr_err("Failed to open resource '%s'.", name); + sr_err("Failed to open resource '%s' (use loglevel 5/spew for" + " details).", name); return ret; } @@ -332,7 +333,7 @@ SR_PRIV gssize sr_resource_read(struct sr_context *ctx, * @param max_size Size limit. Error out if the resource is larger than this. * * @return A buffer containing the resource data, or NULL on failure. Must - * be freed by the caller using g_free(). + * be freed by the caller using g_free(). * * @private */