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.
This commit is contained in:
1 parent
ff5bec34b1
commit
bd3b429b80
4 files changed
+19
-18
No files matched your search
+2
-2
@@ -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 ();
|
||||
|
||||
+10
-12
@@ -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 ('/');
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -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; p<e; ++p)
|
||||
*p = cur_cmd->x.translate[*p];
|
||||
*p = cur_cmd->x.translate.sb[*p];
|
||||
}
|
||||
if (debug)
|
||||
debug_print_line (&line);
|
||||
|
||||
Reference in new issue
Block a user