From bd3b429b80562a4d714a1733857bbe032cbf2f1e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 12 Aug 2026 21:54:26 -0700 Subject: [PATCH] sed: shrink struct sed_cmd translate slots * sed/sed.h (struct sed_cmd): Rename translate to translate.sb, and translatemb to translate.mb, as they are never both used. All uses changed. --- sed/compile.c | 4 ++-- sed/debug.c | 22 ++++++++++------------ sed/execute.c | 4 ++-- sed/sed.h | 7 +++++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sed/compile.c b/sed/compile.c index dd49a4e..f98a561 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -1229,7 +1229,7 @@ compile_program (struct vector *vector) dest(i) : pointer to i-th destination character. NULL : terminator */ trans_pairs = XNMALLOC (2 * src_char_num + 1, char *); - cur_cmd->x.translatemb = trans_pairs; + cur_cmd->x.translate.mb = trans_pairs; for (i = 0; i < src_char_num; i++) { if (idx >= dest_len) @@ -1271,7 +1271,7 @@ compile_program (struct vector *vector) while (dest_len--) translate[*ustring++] = (unsigned char)*dest_buf++; - cur_cmd->x.translate = translate; + cur_cmd->x.translate.sb = translate; } read_end_of_cmd (); diff --git a/sed/debug.c b/sed/debug.c index 833bdce..cfce6a5 100644 --- a/sed/debug.c +++ b/sed/debug.c @@ -234,30 +234,28 @@ debug_print_subst (const struct subst *s) static void debug_print_translation (const struct sed_cmd *sc) { - idx_t i; - if (mb_cur_max > 1) { /* multibyte translation */ putchar ('/'); - for (i = 0; sc->x.translatemb[2 * i] != NULL; i++) - fputs (sc->x.translatemb[2 * i], stdout); + for (idx_t i = 0; sc->x.translate.mb[2 * i] != NULL; i++) + fputs (sc->x.translate.mb[2 * i], stdout); putchar ('/'); - for (i = 0; sc->x.translatemb[2 * i] != NULL; i++) - fputs (sc->x.translatemb[2 * i + 1], stdout); + for (idx_t i = 0; sc->x.translate.mb[2 * i] != NULL; i++) + fputs (sc->x.translate.mb[2 * i + 1], stdout); putchar ('/'); } else { /* unibyte translation */ putchar ('/'); - for (i = 0; i < 256; ++i) - if (sc->x.translate[i] != (unsigned char) i) - putchar ((unsigned char) i); + for (idx_t i = 0; i < UCHAR_MAX + 1; ++i) + if (sc->x.translate.sb[i] != i) + putchar (i); putchar ('/'); - for (i = 0; i < 256; ++i) - if (sc->x.translate[i] != (unsigned char) i) - putchar (sc->x.translate[i]); + for (idx_t i = 0; i < UCHAR_MAX + 1; ++i) + if (sc->x.translate.sb[i] != i) + putchar (sc->x.translate.sb[i]); putchar ('/'); } } diff --git a/sed/execute.c b/sed/execute.c index f7e6d02..6e47a3b 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -1578,13 +1578,13 @@ execute_program (struct vector *vec, struct input *input) case 'y': if (mb_cur_max > 1) - translate_mb (cur_cmd->x.translatemb); + translate_mb (cur_cmd->x.translate.mb); else { unsigned char *p, *e; p = (unsigned char *)line.active; for (e=p+line.length; px.translate[*p]; + *p = cur_cmd->x.translate.sb[*p]; } if (debug) debug_print_line (&line); diff --git a/sed/sed.h b/sed/sed.h index 045d0e6..23d6fd8 100644 --- a/sed/sed.h +++ b/sed/sed.h @@ -183,8 +183,11 @@ struct sed_cmd { struct output *inf; /* This is used for the y command. */ - unsigned char *translate; - char **translatemb; + union + { + unsigned char *sb; + char **mb; + } translate; /* This is used for the ':' command (debug only). */ char* label_name;