mirror of
https://git.code.sf.net/p/zint/code
synced 2026-05-11 08:33:48 +00:00
general: prefix all INTERNAL funcs/tables with zint_, except
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:
@@ -341,7 +341,7 @@ static void test_hrt(const testCtx *const p_ctx) {
|
||||
|
||||
if (do_bwipp && testUtilCanBwipp(i, symbol, -1, data[i].option_2, -1, debug)) {
|
||||
if (data[i].symbology == BARCODE_HIBC_128
|
||||
&& not_sane(IS_NUM_F | IS_UPR_F | IS_SPC_F | IS_PLS_F | IS_MNS_F | IS_SIL_F, (const unsigned char *) data[i].data, length)) {
|
||||
&& z_not_sane(IS_NUM_F | IS_UPR_F | IS_SPC_F | IS_PLS_F | IS_MNS_F | IS_SIL_F, ZCUCP(data[i].data), length)) {
|
||||
if (debug & ZINT_DEBUG_TEST_PRINT) {
|
||||
printf("i:%d %s not BWIPP compatible (%s)\n",
|
||||
i, testUtilBarcodeName(symbol->symbology), "BWIPP does not uppercase input");
|
||||
@@ -835,14 +835,14 @@ static void test_gs1_128_input(const testCtx *const p_ctx) {
|
||||
assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d (%s)\n",
|
||||
i, symbol->width, data[i].expected_width, data[i].data);
|
||||
if (ret == ZINT_WARN_HRT_TRUNCATED) {
|
||||
assert_nonzero((int) ustrlen(symbol->text) < (int) strlen(data[i].data),
|
||||
assert_nonzero((int) z_ustrlen(symbol->text) < (int) strlen(data[i].data),
|
||||
"i:%d len symbol->text(%s) %d >= %d (%s) (%s)\n",
|
||||
i, symbol->text, (int) ustrlen(symbol->text), (int) strlen(data[i].data), data[i].data,
|
||||
i, symbol->text, (int) z_ustrlen(symbol->text), (int) strlen(data[i].data), data[i].data,
|
||||
symbol->errtxt);
|
||||
} else {
|
||||
assert_equal((int) ustrlen(symbol->text), (int) strlen(data[i].data),
|
||||
assert_equal((int) z_ustrlen(symbol->text), (int) strlen(data[i].data),
|
||||
"i:%d len symbol->text(%s) %d != %d (%s, %s) (%s)\n",
|
||||
i, symbol->text, (int) ustrlen(symbol->text), (int) strlen(data[i].data),
|
||||
i, symbol->text, (int) z_ustrlen(symbol->text), (int) strlen(data[i].data),
|
||||
testUtilErrorName(ret), data[i].data, symbol->errtxt);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user