shared/qrcode-util: reduce scope of iterator variables

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-10-23 20:35:47 +02:00
parent 9337945233
commit c9e9a57fce
1 changed files with 8 additions and 14 deletions

View File

@ -4,13 +4,11 @@
#define ANSI_WHITE_ON_BLACK "\033[40;37;1m"
static void print_border(FILE *output, unsigned width) {
unsigned x, y;
/* Four rows of border */
for (y = 0; y < 4; y += 2) {
for (unsigned y = 0; y < 4; y += 2) {
fputs(ANSI_WHITE_ON_BLACK, output);
for (x = 0; x < 4 + width + 4; x++)
for (unsigned x = 0; x < 4 + width + 4; x++)
fputs("\342\226\210", output);
fputs(ANSI_NORMAL "\n", output);
@ -18,8 +16,6 @@ static void print_border(FILE *output, unsigned width) {
}
void write_qrcode(FILE *output, QRcode *qr) {
unsigned x, y;
assert(qr);
if (!output)
@ -27,17 +23,15 @@ void write_qrcode(FILE *output, QRcode *qr) {
print_border(output, qr->width);
for (y = 0; y < (unsigned) qr->width; y += 2) {
const uint8_t *row1, *row2;
row1 = qr->data + qr->width * y;
row2 = row1 + qr->width;
for (unsigned y = 0; y < (unsigned) qr->width; y += 2) {
const uint8_t *row1 = qr->data + qr->width * y;
const uint8_t *row2 = row1 + qr->width;
fputs(ANSI_WHITE_ON_BLACK, output);
for (x = 0; x < 4; x++)
for (unsigned x = 0; x < 4; x++)
fputs("\342\226\210", output);
for (x = 0; x < (unsigned) qr->width; x ++) {
for (unsigned x = 0; x < (unsigned) qr->width; x++) {
bool a, b;
a = row1[x] & 1;
@ -53,7 +47,7 @@ void write_qrcode(FILE *output, QRcode *qr) {
fputs("\342\226\210", output);
}
for (x = 0; x < 4; x++)
for (unsigned x = 0; x < 4; x++)
fputs("\342\226\210", output);
fputs(ANSI_NORMAL "\n", output);
}