mirror of
https://git.code.sf.net/p/zint/code
synced 2025-12-17 18:07:02 +00:00
Avoid possible confusion with Windows error code
Bugfix by Oxy Genic Ref: https://sourceforge.net/p/zint/mailman/message/34857131/
This commit is contained in:
@@ -1031,7 +1031,7 @@ int code_one(struct zint_symbol *symbol, unsigned char source[], int length)
|
||||
|
||||
if((symbol->option_2 < 0) || (symbol->option_2 > 10)) {
|
||||
strcpy(symbol->errtxt, "Invalid symbol size");
|
||||
return ERROR_INVALID_OPTION;
|
||||
return ZINT_ERROR_INVALID_OPTION;
|
||||
}
|
||||
|
||||
if(symbol->option_2 == 9) {
|
||||
@@ -1044,11 +1044,11 @@ int code_one(struct zint_symbol *symbol, unsigned char source[], int length)
|
||||
|
||||
if(length > 18) {
|
||||
strcpy(symbol->errtxt, "Input data too long");
|
||||
return ERROR_TOO_LONG;
|
||||
return ZINT_ERROR_TOO_LONG;
|
||||
}
|
||||
if(is_sane(NEON, source, length) == ERROR_INVALID_DATA) {
|
||||
if(is_sane(NEON, source, length) == ZINT_ERROR_INVALID_DATA) {
|
||||
strcpy(symbol->errtxt, "Invalid input data (Version S encodes numeric input only)");
|
||||
return ERROR_INVALID_DATA;
|
||||
return ZINT_ERROR_INVALID_DATA;
|
||||
}
|
||||
|
||||
sub_version = 3; codewords = 12; block_width = 6; /* Version S-30 */
|
||||
@@ -1120,12 +1120,12 @@ int code_one(struct zint_symbol *symbol, unsigned char source[], int length)
|
||||
data_length = c1_encode(symbol, source, data, length);
|
||||
|
||||
if(data_length == 0) {
|
||||
return ERROR_TOO_LONG;
|
||||
return ZINT_ERROR_TOO_LONG;
|
||||
}
|
||||
|
||||
if(data_length > 38) {
|
||||
strcpy(symbol->errtxt, "Input data too long");
|
||||
return ERROR_TOO_LONG;
|
||||
return ZINT_ERROR_TOO_LONG;
|
||||
}
|
||||
|
||||
size = 10;
|
||||
@@ -1187,7 +1187,7 @@ int code_one(struct zint_symbol *symbol, unsigned char source[], int length)
|
||||
data_length = c1_encode(symbol, source, data, length);
|
||||
|
||||
if(data_length == 0) {
|
||||
return ERROR_TOO_LONG;
|
||||
return ZINT_ERROR_TOO_LONG;
|
||||
}
|
||||
|
||||
for(i = 7; i >= 0; i--) {
|
||||
|
||||
Reference in New Issue
Block a user