procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "BR 3392696: nasm_quote -- fixup callers"

Browse source 
This reverts commit 6c300aa488.

Will apply a modified version from the nasm-2.15.xx branch instead.
This commit is contained in:
H. Peter Anvin 2020-07-12 06:04:48 -07:00
parent b9a44fcdf0
commit 6a9d1e56c6
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asm/nasm.c
View file

@ -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)

5
asm/preproc.c
View file

@ -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);
}