mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-30 23:05:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

GS1PARENS_MODE: allow parentheses in AI data if backslashed and

Browse source 
in `ESCAPE_MODE`
composite: empty primary now returns `ZINT_ERROR_INVALID_DATA`
  rather than `ZINT_ERROR_INVALID_OPTION`;
  check that primary NUL-terminated
library: check that `outfile` NUL-terminated
gs1: preface all routines and linters with "gs1_"
general: some code fiddling
This commit is contained in:
gitlost 2025-04-24 18:40:50 +01:00
parent 51ebca182c
commit fcb3f9b422
29 changed files with 1586 additions and 1184 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backend/tools/gen_gs1_lint.php
View file

@ -133,13 +133,13 @@ foreach ($lines as $line) {
$max = (int) substr($matches[3], 2);
}
if ($matches[1] === 'N') {
$validator = "numeric";
$validator = "gs1_numeric";
} elseif ($matches[1] === 'X') {
$validator = "cset82";
$validator = "gs1_cset82";
} elseif ($matches[1] === 'Y') {
$validator = "cset39";
$validator = "gs1_cset39";
} else { // 'Z'
$validator = "cset64";
$validator = "gs1_cset64";
}
} else if (preg_match('/^\[([NXYZ])([1-9]+)?(\.\.[0-9|]+)?\]$/', $validator, $matches)) {
if (count($matches) === 3) {
@ -150,13 +150,13 @@ foreach ($lines as $line) {
$max = (int) substr($matches[3], 2);
}
if ($matches[1] === 'N') {
$validator = "numeric";
$validator = "gs1_numeric";
} elseif ($matches[1] === 'X') {
$validator = "cset82";
$validator = "gs1_cset82";
} elseif ($matches[1] === 'Y') {
$validator = "cset39";
$validator = "gs1_cset39";
} else { // 'Z'
$validator = "cset64";
$validator = "gs1_cset64";
}
} else {
exit("$basename:" . __LINE__ . " ERROR: Could not parse validator \"$validator\" line $line_no"
@ -288,7 +288,7 @@ EOD;
// Print the spec validator/checkers functions
foreach ($spec_parts as $spec => $spec_part) {
$spec_funcs[$spec] = $spec_func = str_replace(array(' ', '.', ',', '[', ']'), '_', strtolower($spec));
$spec_funcs[$spec] = $spec_func = 'gs1_' . str_replace(array(' ', '.', ',', '[', ']'), '_', strtolower($spec));
$comment = '';
if (isset($spec_comments[$spec])) {
$comment = ' (Used by';
@ -327,7 +327,7 @@ EOD;
foreach ($checkers as $checker) {
print <<<EOD
$tab$tab{$tab}&& $checker(data, data_len, $offset, $min, $max, p_err_no, p_err_posn, err_msg$length_only_arg)
$tab$tab{$tab}&& gs1_$checker(data, data_len, $offset, $min, $max, p_err_no, p_err_posn, err_msg$length_only_arg)
EOD;
}
@ -347,7 +347,7 @@ EOD;
foreach ($checkers as $checker) {
print <<<EOD
$tab$tab{$tab}&& $checker(data, data_len, $offset, $min, $max, p_err_no, p_err_posn, err_msg$length_only_arg)
$tab$tab{$tab}&& gs1_$checker(data, data_len, $offset, $min, $max, p_err_no, p_err_posn, err_msg$length_only_arg)
EOD;
}