From ca2790ff3cfe088853737b00d96aa6f46d278ea7 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Wed, 17 Jul 2024 09:45:36 +0200 Subject: [PATCH] add const for hex numbers --- src/rename.c | 57 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/src/rename.c b/src/rename.c index 150db81..e13c6d3 100644 --- a/src/rename.c +++ b/src/rename.c @@ -3,19 +3,38 @@ #include #include "rename.h" +#define SPACE 0x20 +#define ROUND_BRACKET_OPEN 0x28 +#define ROUND_BRACKET_CLOSE 0x29 +#define BRACKET_OPEN 0x5b +#define BRACKET_CLOSE 0x5d +#define BRACE_OPEN 0x7b +#define BRACE_CLOSE 0x7d +#define POINT 0x2e +#define A 0x41 +#define Z 0x5a +#define WIDE_CHAR_PREFIX 0xffffffc3 +#define WIDE_CHAR_a 0xffffffa4 +#define WIDE_CHAR_A 0xffffff84 +#define WIDE_CHAR_o 0xffffffb6 +#define WIDE_CHAR_O 0xffffff96 +#define WIDE_CHAR_u 0xffffffbc +#define WIDE_CHAR_U 0xffffff9c +#define WIDE_CHAR_SS 0xffffff9f + void escape_str(char* src, char* dst) { int len = strlen(src); int dstcounter = 0; for (int i = 0; i < len; i++) { switch(src[i]) { - case 0x20: - case 0x28: - case 0x29: - case 0x5b: - case 0x5d: - case 0x7b: - case 0x7d: + case SPACE: + case ROUND_BRACKET_OPEN: + case ROUND_BRACKET_CLOSE: + case BRACKET_OPEN: + case BRACKET_CLOSE: + case BRACE_OPEN: + case BRACE_CLOSE: dst[dstcounter++] = '\\'; dst[dstcounter++] = src[i]; break; @@ -31,10 +50,10 @@ void rename_point_str(char* src, char* dst) int len = strlen(src); int point_count = 0; for (int i = len - 1; i >= 0; i--) { - if (src[i] == 0x2e) + if (src[i] == POINT) point_count++; - if (src[i] != 0x2e) + if (src[i] != POINT) break; } @@ -53,8 +72,8 @@ void rename_lower_str(char* src, char* dst) rename_str(src, dst); int len = strlen(dst); for (int i = 0; i < len; i++) { - if (dst[i] >= 0x41 && dst[i] <= 0x5a) { - dst[i] = dst[i] + 0x20; + if (dst[i] >= A && dst[i] <= Z) { + dst[i] = dst[i] + SPACE; } } } @@ -64,33 +83,33 @@ void rename_str(char* src, char* dst) int len = strlen(src); int dstcounter = 0; for (int i = 0; i < len; i++) { - if (src[i] == ' ') { + if (src[i] == SPACE) { dst[dstcounter++] = '_'; - } else if (src[i] == 0xffffffc3 && src[i + 1] == 0xffffffa4) { + } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_a) { i++; dst[dstcounter++] = 'a'; dst[dstcounter++] = 'e'; - } else if (src[i] == 0xffffffc3 && src[i + 1] == 0xffffff84) { + } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_A) { i++; dst[dstcounter++] = 'A'; dst[dstcounter++] = 'e'; - } else if (src[i] == 0xffffffc3 && src[i + 1] == 0xffffffb6) { + } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_o) { i++; dst[dstcounter++] = 'o'; dst[dstcounter++] = 'e'; - } else if (src[i] == 0xffffffc3 && src[i + 1] == 0xffffff96) { + } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_O) { i++; dst[dstcounter++] = 'O'; dst[dstcounter++] = 'e'; - } else if (src[i] == 0xffffffc3 && src[i + 1] == 0xffffffbc) { + } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_u) { i++; dst[dstcounter++] = 'u'; dst[dstcounter++] = 'e'; - } else if (src[i] == 0xffffffc3 && src[i + 1] == 0xffffff9c) { + } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_U) { i++; dst[dstcounter++] = 'U'; dst[dstcounter++] = 'e'; - } else if (src[i] == 0xffffffc3 && src[i + 1] == 0xffffff9f) { + } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_SS) { i++; dst[dstcounter++] = 's'; dst[dstcounter++] = 's'; -- 2.39.5