Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-03 02:07:14 +00:00
Code Issues Projects Releases Wiki Activity

general: prefix all INTERNAL funcs/tables with zint_, except

Browse Source 
those in "backend/common.h", which are prefixed by `z_` - makes
  symbol clashes more unlikely when zint is statically linked
  (ticket #337, props Ulrich Becker)
DOTCODE: fix padding allowance (10 -> 52 - probable max 35) to
  cover cases with large no. of columns requested and little data,
  to prevent `codeword_array` buffer overflow
AZTEC/CODEONE: some code fiddling
general_field: prefix defines with `GF_`, shorten static funcs
  prefix `general_field_` -> `gf_`
This commit is contained in:
gitlost
2025-08-26 23:48:00 +01:00
parent e18b047a45
commit 39380d6767
106 changed files with 4477 additions and 4360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
backend/tests/test_filemem.c
View File

@@ -178,7 +178,7 @@ static void test_putsf(const testCtx *const p_ctx) {
} else {
symbol->output_options |= BARCODE_MEMORY_FILE;
}
assert_nonzero(fm_open(fmp, symbol, "w"), "i:%d: fm_open fail (%d, %s)\n",
assert_nonzero(zint_fm_open(fmp, symbol, "w"), "i:%d: zint_fm_open fail (%d, %s)\n",
i, fmp->err, strerror(fmp->err));
if (j == 1) {
#ifndef ZINT_TEST_NO_FMEMOPEN
@@ -197,9 +197,9 @@ static void test_putsf(const testCtx *const p_ctx) {
}
}
fm_putsf(data[i].prefix, data[i].dp, data[i].arg, fmp);
zint_fm_putsf(data[i].prefix, data[i].dp, data[i].arg, fmp);
assert_nonzero(fm_close(fmp, symbol), "i:%d: fm_close fail (%d, %s)\n", i, fmp->err, strerror(fmp->err));
assert_nonzero(zint_fm_close(fmp, symbol), "i:%d: zint_fm_close fail (%d, %s)\n", i, fmp->err, strerror(fmp->err));
if (locale) {
assert_nonnull(setlocale(LC_ALL, locale), "i:%d: setlocale(%s) restore fail (%d, %s)\n",
@@ -263,14 +263,14 @@ static void test_printf(const testCtx *const p_ctx) {
} else {
symbol->output_options |= BARCODE_MEMORY_FILE;
}
ret = fm_open(fmp, symbol, "wb");
assert_equal(ret, 1, "fm_open ret %d != 1\n", ret);
ret = zint_fm_open(fmp, symbol, "wb");
assert_equal(ret, 1, "zint_fm_open ret %d != 1\n", ret);
ret = fm_printf(fmp, fmt1, "gosh", 123, "gee");
assert_equal(ret, 1, "fm_printf ret %d != 1\n", ret);
ret = zint_fm_printf(fmp, fmt1, "gosh", 123, "gee");
assert_equal(ret, 1, "zint_fm_printf ret %d != 1\n", ret);
ret = fm_close(fmp, symbol);
assert_equal(ret, 1, "fm_close ret %d != 1\n", ret);
ret = zint_fm_close(fmp, symbol);
assert_equal(ret, 1, "zint_fm_close ret %d != 1\n", ret);
expected_size = (int) strlen(expected);
@@ -301,14 +301,14 @@ static void test_printf(const testCtx *const p_ctx) {
} else {
symbol->output_options |= BARCODE_MEMORY_FILE;
}
ret = fm_open(fmp, symbol, "w");
assert_equal(ret, 1, "fm_open ret %d != 1\n", ret);
ret = zint_fm_open(fmp, symbol, "w");
assert_equal(ret, 1, "zint_fm_open ret %d != 1\n", ret);
ret = fm_printf(fmp, fmt1, "gosh", 123, "gee");
assert_equal(ret, 1, "fm_printf ret %d != 1\n", ret);
ret = zint_fm_printf(fmp, fmt1, "gosh", 123, "gee");
assert_equal(ret, 1, "zint_fm_printf ret %d != 1\n", ret);
ret = fm_close(fmp, symbol);
assert_equal(ret, 1, "fm_close ret %d != 1\n", ret);
ret = zint_fm_close(fmp, symbol);
assert_equal(ret, 1, "zint_fm_close ret %d != 1\n", ret);
expected_size = (int) strlen(expected);
@@ -358,63 +358,63 @@ static void test_seek(const testCtx *const p_ctx) {
} else {
symbol->output_options |= BARCODE_MEMORY_FILE;
}
ret = fm_open(fmp, symbol, "wb");
assert_equal(ret, 1, "j:%d fm_open ret %d != 1\n", j, ret);
ret = zint_fm_open(fmp, symbol, "wb");
assert_equal(ret, 1, "j:%d zint_fm_open ret %d != 1\n", j, ret);
ret = fm_puts("1234567890", fmp);
assert_equal(ret, 1, "j:%d fm_puts ret %d != 1\n", j, ret);
ret = zint_fm_puts("1234567890", fmp);
assert_equal(ret, 1, "j:%d zint_fm_puts ret %d != 1\n", j, ret);
if (j != 1) {
assert_nonnull(fmp->mem, "mem NULL (%d: %s)\n", fmp->err, strerror(fmp->err));
assert_equal(fmp->mempos, 10, "mempos %d != 10\n", (int) fmp->mempos);
assert_zero(memcmp(fmp->mem, "1234567890", fmp->mempos), "memcmp fail\n");
}
ret = fm_seek(fmp, -10, SEEK_CUR);
assert_equal(ret, 1, "j:%d fm_seek ret %d != 1 (%d: %s)\n", j, ret, fmp->err, strerror(fmp->err));
ret = fm_error(fmp);
assert_zero(ret, "j:%d fm_error ret %d != 0\n", j, ret);
ret = (int) fm_tell(fmp);
assert_zero(ret, "j:%d fm_tell ret %d != 0\n", j, ret);
ret = zint_fm_seek(fmp, -10, SEEK_CUR);
assert_equal(ret, 1, "j:%d zint_fm_seek ret %d != 1 (%d: %s)\n", j, ret, fmp->err, strerror(fmp->err));
ret = zint_fm_error(fmp);
assert_zero(ret, "j:%d zint_fm_error ret %d != 0\n", j, ret);
ret = (int) zint_fm_tell(fmp);
assert_zero(ret, "j:%d zint_fm_tell ret %d != 0\n", j, ret);
ret = fm_seek(fmp, 0, SEEK_END);
assert_equal(ret, 1, "j:%d fm_seek ret %d != 1\n", j, ret);
ret = fm_error(fmp);
assert_zero(ret, "j:%d fm_error ret %d != 0\n", j, ret);
ret = (int) fm_tell(fmp);
assert_equal(ret, 10, "j:%d fm_tell ret %d != 10\n", j, ret);
ret = zint_fm_seek(fmp, 0, SEEK_END);
assert_equal(ret, 1, "j:%d zint_fm_seek ret %d != 1\n", j, ret);
ret = zint_fm_error(fmp);
assert_zero(ret, "j:%d zint_fm_error ret %d != 0\n", j, ret);
ret = (int) zint_fm_tell(fmp);
assert_equal(ret, 10, "j:%d zint_fm_tell ret %d != 10\n", j, ret);
ret = fm_seek(fmp, -1, SEEK_SET);
assert_zero(ret, "j:%d fm_seek ret %d != 1\n", j, ret);
ret = zint_fm_seek(fmp, -1, SEEK_SET);
assert_zero(ret, "j:%d zint_fm_seek ret %d != 1\n", j, ret);
assert_equal(fmp->err, EINVAL, "j:%d fmp->err %d (%s) != EINVAL\n", j, fmp->err, strerror(fmp->err));
ret = fm_close(fmp, symbol);
assert_zero(ret, "j:%d fm_close ret %d != 0\n", j, ret);
ret = zint_fm_close(fmp, symbol);
assert_zero(ret, "j:%d zint_fm_close ret %d != 0\n", j, ret);
assert_equal(fmp->err, EINVAL, "j:%d fmp->err %d (%s) != EINVAL\n", j, fmp->err, strerror(fmp->err));
if (j == 1) {
assert_zero(testUtilRemove(symbol->outfile), "testUtilRemove(%s) != 0\n", symbol->outfile);
}
ret = fm_open(fmp, symbol, "wb");
assert_equal(ret, 1, "j:%d fm_open ret %d != 1\n", j, ret);
ret = zint_fm_open(fmp, symbol, "wb");
assert_equal(ret, 1, "j:%d zint_fm_open ret %d != 1\n", j, ret);
ret = fm_seek(fmp, LONG_MAX, SEEK_CUR);
ret = zint_fm_seek(fmp, LONG_MAX, SEEK_CUR);
if (j == 1) { /* May work on some file systems */
if (ret == 0) {
assert_equal(fmp->err, EINVAL, "j:%d fmp->err %d (%s) != EINVAL\n", j, fmp->err, strerror(fmp->err));
}
} else {
assert_zero(ret, "j:%d fm_seek ret %d != 0\n", j, ret);
assert_zero(ret, "j:%d zint_fm_seek ret %d != 0\n", j, ret);
assert_equal(fmp->err, EINVAL, "j:%d fmp->err %d (%s) != EINVAL\n", j, fmp->err, strerror(fmp->err));
}
ret = fm_close(fmp, symbol);
ret = zint_fm_close(fmp, symbol);
if (j == 1) { /* See above */
if (ret == 0) {
assert_equal(fmp->err, EINVAL, "j:%d fmp->err %d (%s) != EINVAL\n", j, fmp->err, strerror(fmp->err));
}
} else {
assert_zero(ret, "j:%d fm_close ret %d != 0\n", j, ret);
assert_zero(ret, "j:%d zint_fm_close ret %d != 0\n", j, ret);
assert_equal(fmp->err, EINVAL, "j:%d fmp->err %d (%s) != EINVAL\n", j, fmp->err, strerror(fmp->err));
}