1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-11 13:01:28 +02:00

39087: fix 'conditionally uninitialized' variables

This commit is contained in:
Jun-ichi Takimoto 2016-08-23 18:18:50 +09:00
parent d1d79796fb
commit acad0620ef
3 changed files with 7 additions and 2 deletions

View file

@ -1,5 +1,8 @@
2016-08-23 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> 2016-08-23 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 39087: Src/builtin.c, Src/utils.c: fix 'conditionally
uninitialized' variables
* 39086: Src/mem.c: declare file local variables as 'static' * 39086: Src/mem.c: declare file local variables as 'static'
2016-08-22 Oliver Kiddle <opk@zsh.org> 2016-08-22 Oliver Kiddle <opk@zsh.org>

View file

@ -1610,7 +1610,7 @@ bin_fc(char *nam, char **argv, Options ops, int func)
unqueue_signals(); unqueue_signals();
if (fcedit(editor, fil)) { if (fcedit(editor, fil)) {
if (stuff(fil)) if (stuff(fil))
zwarnnam("fc", "%e: %s", errno, s); zwarnnam("fc", "%e: %s", errno, fil);
else { else {
loop(0,1); loop(0,1);
retval = lastval; retval = lastval;

View file

@ -5082,8 +5082,10 @@ mb_niceformat(const char *s, FILE *stream, char **outstrp, int flags)
cnt = 1; cnt = 1;
/* FALL THROUGH */ /* FALL THROUGH */
default: default:
if (c == L'\'' && (flags & NICEFLAG_QUOTE)) if (c == L'\'' && (flags & NICEFLAG_QUOTE)) {
fmt = "\\'"; fmt = "\\'";
newl = 2;
}
else else
fmt = wcs_nicechar_sel(c, &newl, NULL, flags & NICEFLAG_QUOTE); fmt = wcs_nicechar_sel(c, &newl, NULL, flags & NICEFLAG_QUOTE);
break; break;