mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: test_library: fix snafus from previous commit [5e2044]

Browse Source 
(Windows)
This commit is contained in:
gitlost 2024-10-27 22:19:43 +00:00
parent 5e2044ff2e
commit 7e6da28761
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/common.c
View File

@ -385,12 +385,12 @@ INTERNAL int errtxtf(const int error_number, struct zint_symbol *symbol, const i
if (arg == -1) { if (arg == -1) {
if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0); if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0);
return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0, return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0,
"Internal error: invalid numbered format specifer"); "Internal error: invalid numbered format specifer");
} }
if (i >= 9) { if (i >= 9) {
if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0); if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0);
return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0, return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0,
"Internal error: too many format specifiers (9 maximum)"); "Internal error: too many format specifiers (9 maximum)");
} }
f += inc; f += inc;
have_num_arg = 1; have_num_arg = 1;
@ -399,7 +399,7 @@ INTERNAL int errtxtf(const int error_number, struct zint_symbol *symbol, const i
if (i >= 9) { if (i >= 9) {
if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0); if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0);
return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0, return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0,
"Internal error: too many format specifiers (9 maximum)"); "Internal error: too many format specifiers (9 maximum)");
} }
have_unnum_arg = 1; have_unnum_arg = 1;
idxs[i] = i; idxs[i] = i;
@ -421,7 +421,7 @@ INTERNAL int errtxtf(const int error_number, struct zint_symbol *symbol, const i
if (*f != 'c' && *f != 'd' && *f != 'f' && *f != 'g' && *f != 's') { if (*f != 'c' && *f != 'd' && *f != 'f' && *f != 'g' && *f != 's') {
if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0); if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0);
return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0, return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0,
"Internal error: unknown format specifier ('%c','%d','%f','%g','%s' only)"); "Internal error: unknown format specifier ('%c','%d','%f','%g','%s' only)");
} }
specs[idxs[i++]] = *f; specs[idxs[i++]] = *f;
arg_cnt++; arg_cnt++;
@ -430,7 +430,7 @@ INTERNAL int errtxtf(const int error_number, struct zint_symbol *symbol, const i
if (have_num_arg && have_unnum_arg) { if (have_num_arg && have_unnum_arg) {
if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0); if (!(symbol->debug & ZINT_DEBUG_TEST)) assert(0);
return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0, return errtxt(ZINT_ERROR_ENCODING_PROBLEM, symbol, 0,
"Internal error: mixed numbered and unnumbered format specifiers"); "Internal error: mixed numbered and unnumbered format specifiers");
} }
/* Get arguments */ /* Get arguments */
@ -440,7 +440,7 @@ INTERNAL int errtxtf(const int error_number, struct zint_symbol *symbol, const i
cs[i] = va_arg(ap, int); cs[i] = va_arg(ap, int);
} else if (specs[i] == 'd') { } else if (specs[i] == 'd') {
if (dpads[i][0]) { if (dpads[i][0]) {
char dpad_fmt[30]; /* Make 30 to suppress GNU c "-Wformat-overflow=" false positive */ char dpad_fmt[30]; /* Make 30 to suppress gcc 14 "-Wformat-overflow=" false positive */
sprintf(dpad_fmt, "%%0%sd", dpads[i]); /* TODO: keep `dpads` separate else last mentioned trumps */ sprintf(dpad_fmt, "%%0%sd", dpads[i]); /* TODO: keep `dpads` separate else last mentioned trumps */
sprintf(dfgs[i], dpad_fmt, va_arg(ap, int)); sprintf(dfgs[i], dpad_fmt, va_arg(ap, int));
} else { } else {

12
backend/tests/test_library.c
View File

@ -1041,12 +1041,12 @@ static void test_encode_file_too_large(const testCtx *const p_ctx) {
static void test_encode_file_unreadable(const testCtx *const p_ctx) { static void test_encode_file_unreadable(const testCtx *const p_ctx) {
#ifndef _WIN32 #ifndef _WIN32
int ret; int ret;
struct zint_symbol *symbol = NULL;
char filename[] = "in.bin"; char filename[] = "in.bin";
char buf[ZINT_MAX_DATA_LEN + 1] = {0}; char buf[ZINT_MAX_DATA_LEN + 1] = {0};
int fd; int fd;
#endif #endif
struct zint_symbol *symbol = NULL;
(void)p_ctx; (void)p_ctx;
@ -1227,7 +1227,7 @@ static void test_bad_args(const testCtx *const p_ctx) {
"Error 200: Input segments NULL", "Error 200: Input segments NULL",
"Error 239: Filename NULL", "Error 239: Filename NULL",
"Error 778: No input data", "Error 778: No input data",
"Error 229: Unable to read input file (2: No such file or directory)", "Error 229: Unable to read input file (", /* Excluding OS-dependent `errno` stuff */
"Error 771: Too many input segments (maximum 256)", "Error 771: Too many input segments (maximum 256)",
"Error 205: No input data", "Error 205: No input data",
"Error 777: Input too long", "Error 777: Input too long",
@ -1331,16 +1331,16 @@ static void test_bad_args(const testCtx *const p_ctx) {
assert_zero(strcmp(expected[3], symbol->errtxt), "ZBarcode_Encode_Segs_and_Buffer_Vector(symbol, &seg_empty, 1, 0) strcmp(%s, %s) != 0\n", expected[3], symbol->errtxt); assert_zero(strcmp(expected[3], symbol->errtxt), "ZBarcode_Encode_Segs_and_Buffer_Vector(symbol, &seg_empty, 1, 0) strcmp(%s, %s) != 0\n", expected[3], symbol->errtxt);
symbol->errtxt[0] = '\0'; symbol->errtxt[0] = '\0';
assert_equal(ZBarcode_Encode_File(symbol, empty), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode_File(symbol, empty) != ZINT_ERROR_INVALID_DATA\n"); assert_equal(ZBarcode_Encode_File(symbol, empty), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode_File(symbol, empty) != ZINT_ERROR_INVALID_DATA\n");
assert_zero(strcmp(expected[4], symbol->errtxt), "ZBarcode_Encode_File(symbol, empty) strcmp(%s, %s) != 0\n", expected[4], symbol->errtxt); assert_zero(strncmp(expected[4], symbol->errtxt, strlen(expected[4])), "ZBarcode_Encode_File(symbol, empty) strncmp(%s, %s, %d) != 0\n", expected[4], symbol->errtxt, (int) strlen(expected[4]));
symbol->errtxt[0] = '\0'; symbol->errtxt[0] = '\0';
assert_equal(ZBarcode_Encode_File_and_Print(symbol, empty, 0), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode_File_and_Print(symbol, empty, 0) != ZINT_ERROR_INVALID_DATA\n"); assert_equal(ZBarcode_Encode_File_and_Print(symbol, empty, 0), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode_File_and_Print(symbol, empty, 0) != ZINT_ERROR_INVALID_DATA\n");
assert_zero(strcmp(expected[4], symbol->errtxt), "ZBarcode_Encode_File_and_Print(symbol, empty, 0) strcmp(%s, %s) != 0\n", expected[4], symbol->errtxt); assert_zero(strncmp(expected[4], symbol->errtxt, strlen(expected[4])), "ZBarcode_Encode_File(symbol, empty) strncmp(%s, %s, %d) != 0\n", expected[4], symbol->errtxt, (int) strlen(expected[4]));
symbol->errtxt[0] = '\0'; symbol->errtxt[0] = '\0';
assert_equal(ZBarcode_Encode_File_and_Buffer(symbol, empty, 0), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode_File_and_Buffer(symbol, empty, 0) != ZINT_ERROR_INVALID_DATA\n"); assert_equal(ZBarcode_Encode_File_and_Buffer(symbol, empty, 0), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode_File_and_Buffer(symbol, empty, 0) != ZINT_ERROR_INVALID_DATA\n");
assert_zero(strcmp(expected[4], symbol->errtxt), "ZBarcode_Encode_File_and_Buffer(symbol, empty, 0) strcmp(%s, %s) != 0\n", expected[4], symbol->errtxt); assert_zero(strncmp(expected[4], symbol->errtxt, strlen(expected[4])), "ZBarcode_Encode_File(symbol, empty) strncmp(%s, %s, %d) != 0\n", expected[4], symbol->errtxt, (int) strlen(expected[4]));
symbol->errtxt[0] = '\0'; symbol->errtxt[0] = '\0';
assert_equal(ZBarcode_Encode_File_and_Buffer_Vector(symbol, empty, 0), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode_File_and_Buffer_Vector(symbol, empty, 0) != ZINT_ERROR_INVALID_DATA\n"); assert_equal(ZBarcode_Encode_File_and_Buffer_Vector(symbol, empty, 0), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode_File_and_Buffer_Vector(symbol, empty, 0) != ZINT_ERROR_INVALID_DATA\n");
assert_zero(strcmp(expected[4], symbol->errtxt), "ZBarcode_Encode_File_and_Buffer_Vector(symbol, empty, 0) strcmp(%s, %s) != 0\n", expected[4], symbol->errtxt); assert_zero(strncmp(expected[4], symbol->errtxt, strlen(expected[4])), "ZBarcode_Encode_File(symbol, empty) strncmp(%s, %s, %d) != 0\n", expected[4], symbol->errtxt, (int) strlen(expected[4]));
/* Bad seg_count */ /* Bad seg_count */
symbol->errtxt[0] = '\0'; symbol->errtxt[0] = '\0';