From c02f87e61cb013d24e984a117bb9e0302d7c6e9b Mon Sep 17 00:00:00 2001 From: tg Date: Tue, 12 Jul 2005 13:24:00 +0000 Subject: [PATCH] gcc 4.0 with -O2 -Wall thinks it finds these uninitialised variables, so quieten gcc found by Bastian "waldi" Blank --- edit.c | 6 +++--- eval.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/edit.c b/edit.c index 66ce586..6739471 100644 --- a/edit.c +++ b/edit.c @@ -1,4 +1,4 @@ -/** $MirOS: src/bin/mksh/edit.c,v 1.9 2005/07/04 12:07:40 tg Exp $ */ +/** $MirOS: src/bin/mksh/edit.c,v 1.10 2005/07/12 13:23:59 tg Exp $ */ /* $OpenBSD: edit.c,v 1.29 2005/04/13 02:33:08 deraadt Exp $ */ /* $OpenBSD: edit.h,v 1.8 2005/03/28 21:28:22 deraadt Exp $ */ /* $OpenBSD: emacs.c,v 1.37 2005/03/30 17:16:37 deraadt Exp $ */ @@ -10,7 +10,7 @@ #include #include -__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.9 2005/07/04 12:07:40 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.10 2005/07/12 13:23:59 tg Exp $"); #define BEL 0x07 @@ -334,7 +334,7 @@ x_print_expansions(int nwords, char * const *words, int is_command) { int use_copy = 0; int prefix_len; - XPtrV l; + XPtrV l = {}; /* Check if all matches are in the same directory (in this * case, we want to omit the directory name) diff --git a/eval.c b/eval.c index d078d4a..ddd4d31 100644 --- a/eval.c +++ b/eval.c @@ -1,4 +1,4 @@ -/** $MirOS: src/bin/mksh/eval.c,v 1.5 2005/07/04 12:27:25 tg Exp $ */ +/** $MirOS: src/bin/mksh/eval.c,v 1.6 2005/07/12 13:24:00 tg Exp $ */ /* $OpenBSD: eval.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $ */ #include "sh.h" @@ -6,7 +6,7 @@ #include #include -__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.5 2005/07/04 12:27:25 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.6 2005/07/12 13:24:00 tg Exp $"); /* * string expansion @@ -149,7 +149,7 @@ expand(char *cp, /* input word */ char *dp, *sp; /* dest., source */ int fdo, word; /* second pass flags; have word */ int doblank; /* field splitting of parameter/command subst */ - Expand x; /* expansion variables */ + Expand x = {}; /* expansion variables */ SubType st_head, *st; int newlines = 0; /* For trailing newlines in COMSUB */ int saw_eq, tilde_ok; @@ -260,7 +260,7 @@ expand(char *cp, /* input word */ { char *varname = ++sp; /* skip the { or x (}) */ int stype; - int slen; + int slen = 0; sp = strchr(sp, '\0') + 1; /* skip variable */ type = varsub(&x, varname, sp, &stype, &slen);