Use the new TgtTranslateBuf function

git-svn-id: svn://svn.cc65.org/cc65/trunk@493 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ca65/pseudo.c b/src/ca65/pseudo.c
index cbc23b721bff36809d30f557eca749265c6090e9..14568ad22f5eda63ad889cf24f076beec3c73b9f 100644 (file)
--- a/src/ca65/pseudo.c
+++ b/src/ca65/pseudo.c
@@ -293,14 +293,20 @@ static void DoAlign (void)
 static void DoASCIIZ (void)
 /* Define text with a zero terminator */
 {
+    unsigned Len;
+
     while (1) {
+       /* Must have a string constant */
        if (Tok != TOK_STRCON) {
            ErrorSkip (ERR_STRCON_EXPECTED);
            return;
        }
+
+       /* Get the length of the string constant */
+       Len = strlen (SVal);
+
        /* Translate into target charset and emit */
-       TgtTranslateStr (SVal);
-               EmitData ((unsigned char*) SVal, strlen (SVal));
+               EmitData ((unsigned char*) TgtTranslateBuf (SVal, Len), Len);
        NextTok ();
        if (Tok == TOK_COMMA) {
            NextTok ();
@@ -335,8 +341,8 @@ static void DoByte (void)
     while (1) {
        if (Tok == TOK_STRCON) {
            /* A string, translate into target charset and emit */
-           TgtTranslateStr (SVal);
-                   EmitData ((unsigned char*) SVal, strlen (SVal));
+           unsigned Len = strlen (SVal);
+           EmitData ((unsigned char*) TgtTranslateBuf (SVal, Len), Len);
            NextTok ();
        } else {
            EmitByte (Expression ());

diff --git a/src/cc65/litpool.c b/src/cc65/litpool.c
index 2d4432c53a93e7cb6193f8345b714001028f919c..abe07f4b6ee0a93de343483b996942accfe8c487 100644 (file)
--- a/src/cc65/litpool.c
+++ b/src/cc65/litpool.c
@@ -74,10 +74,7 @@ void TranslateLiteralPool (unsigned Offs)
  * charset.
  */
 {
-    while (Offs < LiteralOffs) {
-       LiteralPool[Offs] = TgtTranslateChar (LiteralPool[Offs]);
-       ++Offs;
-    }
+    TgtTranslateBuf (LiteralPool + Offs, LiteralOffs - Offs);
 }