dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cherrypicked minor upstream fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7319 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2021-09-11 23:54:56 +00:00
parent 452dbe5787
commit 49ca294dee
5 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Docs/src/bin/halibut/biblio.c
View file

@ -112,8 +112,10 @@ void gen_citations(paragraph * source, keywordlist * kl)
word *wd = smalloc(sizeof(word)); word *wd = smalloc(sizeof(word));
wd->text = gentext(++bibnum); wd->text = gentext(++bibnum);
wd->type = word_Normal; wd->type = word_Normal;
wd->breaks = FALSE;
wd->alt = NULL; wd->alt = NULL;
wd->next = NULL; wd->next = NULL;
wd->aux = 0;
kw->text = wd; kw->text = wd;
} }
para->kwtext = kw->text; para->kwtext = kw->text;

4
Docs/src/bin/halibut/contents.c
View file

@ -55,6 +55,8 @@ static void dotext(word *** wret, wchar_t * text)
mnewword->type = word_Normal; mnewword->type = word_Normal;
mnewword->alt = NULL; mnewword->alt = NULL;
mnewword->next = NULL; mnewword->next = NULL;
mnewword->breaks = FALSE;
mnewword->aux = 0;
**wret = mnewword; **wret = mnewword;
*wret = &mnewword->next; *wret = &mnewword->next;
} }
@ -66,6 +68,8 @@ static void dospace(word *** wret)
mnewword->type = word_WhiteSpace; mnewword->type = word_WhiteSpace;
mnewword->alt = NULL; mnewword->alt = NULL;
mnewword->next = NULL; mnewword->next = NULL;
mnewword->breaks = FALSE;
mnewword->aux = 0;
**wret = mnewword; **wret = mnewword;
*wret = &mnewword->next; *wret = &mnewword->next;
} }

3
Docs/src/bin/halibut/input.c
View file

@ -763,7 +763,10 @@ static void read_file(paragraph *** ret, input * in, indexdata * idx, tree234 *m
break; break;
case c__comment: case c__comment:
if (isbrace(in)) if (isbrace(in))
{
needkw = -1; // Upstream 56b96573 (r8312)
break; /* `\#{': isn't a comment para */ break; /* `\#{': isn't a comment para */
}
do do
{ {
dtor(t), t = get_token(in); dtor(t), t = get_token(in);

2
Docs/src/bin/halibut/keywords.c
View file

@ -156,6 +156,8 @@ void subst_keywords(paragraph * source, keywordlist * kl)
close->alt = NULL; close->alt = NULL;
close->type = word_XrefEnd; close->type = word_XrefEnd;
close->fpos = ptr->fpos; close->fpos = ptr->fpos;
close->breaks = FALSE;
close->aux = 0;
close->next = ptr->next; close->next = ptr->next;
ptr->next = subst; ptr->next = subst;

4
Docs/src/bin/halibut/ustring.c
View file

@ -119,7 +119,7 @@ wchar_t *ustrlow(wchar_t * s)
return s; return s;
} }
int utoi(wchar_t * s) int utoi(const wchar_t *s)
{ {
int sign = +1; int sign = +1;
int n; int n;
@ -138,7 +138,7 @@ int utoi(wchar_t * s)
s++; s++;
} }
return n; return n * sign;
} }
int utob(wchar_t * s) int utob(wchar_t * s)