[nasm:master] Revert "BR 3392696: nasm_quote -- fixup callers"

[nasm-bot for H. Peter Anvin]

Commit-ID:  6a9d1e56c63725eaa5bac9f3a04b8164229f2328
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=6a9d1e56c63725eaa5bac9f3a04b8164229f2328
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Sun, 12 Jul 2020 06:04:48 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Sun, 12 Jul 2020 06:04:48 -0700

Revert "BR 3392696: nasm_quote -- fixup callers"

This reverts commit 6c300aa4882bc1662df899501f23ff5a93a3547f.

Will apply a modified version from the nasm-2.15.xx branch instead.


---
 asm/nasm.c    | 4 +---
 asm/preproc.c | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/asm/nasm.c b/asm/nasm.c
index 8b8982f2..e9cb5c83 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -454,7 +454,6 @@ static char *nasm_quote_filename(const char *fn)
 {
     const unsigned char *p =
         (const unsigned char *)fn;
-    size_t len;
 
     if (!p || !*p)
         return nasm_strdup("\"\"");
@@ -478,8 +477,7 @@ static char *nasm_quote_filename(const char *fn)
     return nasm_strdup(fn);
 
 quote:
-    len = strlen(fn);
-    return nasm_quote(fn, &len);
+    return nasm_quote(fn, NULL);
 }
 
 static void timestamp(void)
diff --git a/asm/preproc.c b/asm/preproc.c
index 63d40e61..c72e6368 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -797,11 +797,10 @@ Token *quote_token(Token *t)
  */
 static Token *quote_any_token(Token *t)
 {
-    const char *s = tok_text(t);
-    size_t len = strlen(s);
+    size_t len;
     char *p;
 
-    p = nasm_quote(s, &len);
+    p = nasm_quote(tok_text(t), &len);
     t->type = TOK_STRING;
     return set_text_free(t, p, len);
 }