From: Wilfried Göesgens <willi@citadel.org>
Date: Tue, 9 Jun 2009 20:35:39 +0000 (+0000)
Subject: * fix some warnings just visible with -o2
X-Git-Tag: v7.86~1090
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=0e79f5ea3401504f7745e8985553c77e89b93403;hp=75a47326865bbb69232c8b35be19a6e7b87c4838;p=citadel.git

* fix some warnings just visible with -o2
---

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 6fcc5499f..3959e27a6 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -91,9 +91,9 @@ void do_generic(void)
 	}
 
 	output_headers(1, 1, 0, 0, 0, 0);
-
+	Buf = NewStrBuf();
 	serv_puts(bstr("g_cmd"));
-
+	StrBuf_ServGetln(Buf);
 	svput("BOXTITLE", WCS_STRING, _("Server command results"));
 	do_template("beginboxx", NULL);
 
@@ -143,6 +143,7 @@ void do_generic(void)
 	wprintf("<a href=\"display_generic\">Enter another command</a><br />\n");
 	wprintf("<a href=\"display_advanced\">Return to menu</a>\n");
 	do_template("endbox", NULL);
+	FreeStrBuf(&Buf);
 	wDumpContent(1);
 }
 
diff --git a/webcit/subst.c b/webcit/subst.c
index 8b69b26e0..3c9385f59 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -107,6 +107,7 @@ const char *CtxNames[]  = {
 	"Context ROOMS",
 	"Context FLOORS",
 	"Context ITERATE",
+	"Context ICAL",
 	"Context UNKNOWN"
 };
 
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 3bd251818..6d5d5c3da 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -328,7 +328,7 @@ int main(int argc, char **argv)
 	char webcitdir[PATH_MAX] = DATADIR;
 	char *pidfile = NULL;
 	char *hdir;
-	const char *basedir;
+	const char *basedir = NULL;
 #ifdef ENABLE_NLS
 	char *locale = NULL;
 	char *mo = NULL;