summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2019-01-13 20:09:04 -0500
committerSolomon Peachy <pizza@shaftnet.org>2019-01-13 20:09:04 -0500
commit1942141b4a51b381ea7491ca733becb99b9a2031 (patch)
treefbaf084c25455e4292984c642cf2242aa964066d
parent096a383b3f6a0d96aefac5f8e7f8f2b7b001608e (diff)
downloadselphy_print-1942141b4a51b381ea7491ca733becb99b9a2031.tar.gz
selphy_print-1942141b4a51b381ea7491ca733becb99b9a2031.tar.bz2
selphy_print-1942141b4a51b381ea7491ca733becb99b9a2031.zip
common: rename dyesub_read_data() to dyesub_read_file()
-rw-r--r--backend_common.c4
-rw-r--r--backend_common.h2
-rw-r--r--backend_kodak1400.c2
-rw-r--r--backend_kodak605.c2
-rw-r--r--backend_kodak6800.c2
-rw-r--r--backend_mitsu9550.c2
-rw-r--r--backend_shinkos1245.c2
-rw-r--r--backend_shinkos2145.c2
-rw-r--r--backend_shinkos6145.c2
-rw-r--r--backend_shinkos6245.c2
10 files changed, 11 insertions, 11 deletions
diff --git a/backend_common.c b/backend_common.c
index 82726aa..e6731e5 100644
--- a/backend_common.c
+++ b/backend_common.c
@@ -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;
diff --git a/backend_common.h b/backend_common.h
index 6c31432..32ad44d 100644
--- a/backend_common.h
+++ b/backend_common.h
@@ -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);
diff --git a/backend_kodak1400.c b/backend_kodak1400.c
index 6768efc..0b3ac5f 100644
--- a/backend_kodak1400.c
+++ b/backend_kodak1400.c
@@ -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;
}
diff --git a/backend_kodak605.c b/backend_kodak605.c
index 4f2f2d5..e924f4a 100644
--- a/backend_kodak605.c
+++ b/backend_kodak605.c
@@ -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;
}
diff --git a/backend_kodak6800.c b/backend_kodak6800.c
index 8c1e7c5..d17f49f 100644
--- a/backend_kodak6800.c
+++ b/backend_kodak6800.c
@@ -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;
}
diff --git a/backend_mitsu9550.c b/backend_mitsu9550.c
index c6e0def..43e3bf0 100644
--- a/backend_mitsu9550.c
+++ b/backend_mitsu9550.c
@@ -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;
diff --git a/backend_shinkos1245.c b/backend_shinkos1245.c
index f42643d..4b44452 100644
--- a/backend_shinkos1245.c
+++ b/backend_shinkos1245.c
@@ -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;
}
diff --git a/backend_shinkos2145.c b/backend_shinkos2145.c
index 33ce646..212c875 100644
--- a/backend_shinkos2145.c
+++ b/backend_shinkos2145.c
@@ -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;
}
diff --git a/backend_shinkos6145.c b/backend_shinkos6145.c
index c83607b..b0e94df 100644
--- a/backend_shinkos6145.c
+++ b/backend_shinkos6145.c
@@ -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;
}
diff --git a/backend_shinkos6245.c b/backend_shinkos6245.c
index 988235f..ac4638b 100644
--- a/backend_shinkos6245.c
+++ b/backend_shinkos6245.c
@@ -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;
}