common: rename dyesub_read_data() to dyesub_read_file()

This commit is contained in:
Solomon Peachy 2019-01-13 20:09:04 -05:00
parent 54b253d655
commit 295a921747
10 changed files with 11 additions and 11 deletions

View file

@ -30,7 +30,7 @@
#include "backend_common.h"
#include <errno.h>
#define BACKEND_VERSION "0.91"
#define BACKEND_VERSION "0.92"
#ifndef URI_PREFIX
#error "Must Define URI_PREFIX"
#endif
@ -1446,7 +1446,7 @@ minimal:
}
}
int dyesub_read_data(char *filename, void *databuf, int datalen,
int dyesub_read_file(char *filename, void *databuf, int datalen,
int *actual_len)
{
int len;

View file

@ -196,7 +196,7 @@ void dump_markers(struct marker *markers, int marker_count, int full);
void print_license_blurb(void);
void print_help(char *argv0, struct dyesub_backend *backend);
int dyesub_read_data(char *filename, void *databuf, int datalen,
int dyesub_read_file(char *filename, void *databuf, int datalen,
int *actual_len);
uint16_t uint16_to_packed_bcd(uint16_t val);

View file

@ -176,7 +176,7 @@ static int kodak1400_set_tonecurve(struct kodak1400_ctx *ctx, char *fname)
}
/* Read in file */
if ((ret = dyesub_read_data(fname, data, UPDATE_SIZE, NULL))) {
if ((ret = dyesub_read_file(fname, data, UPDATE_SIZE, NULL))) {
ERROR("Failed to read Tone Curve file\n");
goto done;
}

View file

@ -591,7 +591,7 @@ static int kodak605_set_tonecurve(struct kodak605_ctx *ctx, char *fname)
INFO("Set Tone Curve from '%s'\n", fname);
/* Read in file */
if ((ret = dyesub_read_data(fname, data, UPDATE_SIZE, NULL))) {
if ((ret = dyesub_read_file(fname, data, UPDATE_SIZE, NULL))) {
ERROR("Failed to read Tone Curve file\n");
goto done;
}

View file

@ -776,7 +776,7 @@ static int kodak6800_set_tonecurve(struct kodak6800_ctx *ctx, char *fname)
INFO("Set Tone Curve from '%s'\n", fname);
/* Read in file */
if ((ret = dyesub_read_data(fname, data, UPDATE_SIZE, NULL))) {
if ((ret = dyesub_read_file(fname, data, UPDATE_SIZE, NULL))) {
ERROR("Failed to read Tone Curve file\n");
goto done;
}

View file

@ -710,7 +710,7 @@ hdr_done:
}
DEBUG("Reading in 98xx data from disk\n");
if ((ret = dyesub_read_data(MITSU_M98xx_DATATABLE_FILE, ctx->m98xxdata, DATATABLE_SIZE, NULL))) {
if ((ret = dyesub_read_file(MITSU_M98xx_DATATABLE_FILE, ctx->m98xxdata, DATATABLE_SIZE, NULL))) {
ERROR("Unable to read 98xx data table file '%s'\n", MITSU_M98xx_DATATABLE_FILE);
free(ctx->m98xxdata);
return ret;

View file

@ -1094,7 +1094,7 @@ static int set_tonecurve(struct shinkos1245_ctx *ctx, int type, int table, char
/* Read in file */
if ((ret = dyesub_read_data(fname, data, TONE_CURVE_SIZE, NULL))) {
if ((ret = dyesub_read_file(fname, data, TONE_CURVE_SIZE, NULL))) {
ERROR("Failed to read Tone Curve file\n");
goto done;
}

View file

@ -1235,7 +1235,7 @@ static int set_tonecurve(struct shinkos2145_ctx *ctx, int target, char *fname)
}
/* Read in file */
if ((ret = dyesub_read_data(fname, data, UPDATE_SIZE, NULL))) {
if ((ret = dyesub_read_file(fname, data, UPDATE_SIZE, NULL))) {
ERROR("Failed to read Tone Curve file\n");
goto done;
}

View file

@ -1636,7 +1636,7 @@ static int set_tonecurve(struct shinkos6145_ctx *ctx, int target, char *fname)
}
/* Read in file */
if ((ret = dyesub_read_data(fname, data, UPDATE_SIZE * sizeof(uint16_t), NULL))) {
if ((ret = dyesub_read_file(fname, data, UPDATE_SIZE * sizeof(uint16_t), NULL))) {
ERROR("Failed to read Tone Curve file\n");
goto done;
}

View file

@ -1314,7 +1314,7 @@ static int set_tonecurve(struct shinkos6245_ctx *ctx, int target, char *fname)
}
/* Read in file */
if ((ret = dyesub_read_data(fname, data, UPDATE_SIZE * sizeof(uint16_t), NULL))) {
if ((ret = dyesub_read_file(fname, data, UPDATE_SIZE * sizeof(uint16_t), NULL))) {
ERROR("Failed to read Tone Curve file\n");
goto done;
}