Re MR #121 calcium -> static; reinstate STATIC_UNLESS_ZINT_TEST error_tag/strip_bom; whitespace

This commit is contained in:
gitlost 2021-06-10 16:20:14 +01:00
parent 43d7493cf2
commit ede1234b8f
3 changed files with 15 additions and 15 deletions

View File

@ -192,7 +192,7 @@ INTERNAL int dpd_parcel(struct zint_symbol *symbol, unsigned char source[], int
INTERNAL int plot_raster(struct zint_symbol *symbol, int rotate_angle, int file_type); /* Plot to PNG/BMP/PCX */
INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_type); /* Plot to EPS/EMF/SVG */
INTERNAL int error_tag(char error_string[100], int error_number) {
STATIC_UNLESS_ZINT_TEST int error_tag(char error_string[100], int error_number) {
if (error_number != 0) {
const char *fmt = error_number >= ZINT_ERROR ? "Error %.93s" : "Warning %.91s"; /* Truncate if too long */
@ -931,7 +931,7 @@ static int reduced_charset(struct zint_symbol *symbol, unsigned char *source, in
return error_number;
}
INTERNAL void strip_bom(unsigned char *source, int *input_length) {
STATIC_UNLESS_ZINT_TEST void strip_bom(unsigned char *source, int *input_length) {
int i;
/* Note if BOM is only data then not stripped */

View File

@ -236,7 +236,7 @@ INTERNAL int codabar(struct zint_symbol *symbol, unsigned char source[], int len
add_checksum = symbol->option_2 == 1;
for (i = 0; i < length; i++) {
const char calcium[] = CALCIUM;
static const char calcium[] = CALCIUM;
if (add_checksum) {
count += strchr(calcium, source[i]) - calcium;
if (i + 1 == length) {

View File

@ -569,7 +569,7 @@ static void test_valid_id(void) {
testFinish();
}
int error_tag(char error_string[100], int error_number);
STATIC_UNLESS_ZINT_TEST int error_tag(char error_string[100], int error_number);
static void test_error_tag(int index) {
@ -608,7 +608,7 @@ static void test_error_tag(int index) {
testFinish();
}
void strip_bom(unsigned char *source, int *input_length);
STATIC_UNLESS_ZINT_TEST void strip_bom(unsigned char *source, int *input_length);
static void test_strip_bom(void) {