From: Art Cancro <ajc@citadel.org>
Date: Fri, 17 Oct 2003 02:31:45 +0000 (+0000)
Subject: * Multi-line string literals are deprecated in GCC 3.1 unless each line
X-Git-Tag: v7.86~5748
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=a66490f6bbe038bf7bbe2e007ee156bd4495612b;p=citadel.git

* Multi-line string literals are deprecated in GCC 3.1 unless each line
  is wrapped in quotes.  Performed this fix so it'll compile.
* setup.c: removed references to unused variable tempfile[]
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index b070c0613..e62ba261f 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 500.28  2003/10/17 02:31:45  ajc
+* Multi-line string literals are deprecated in GCC 3.1 unless each line
+  is wrapped in quotes.  Performed this fix so it'll compile.
+* setup.c: removed references to unused variable tempfile[]
+
 Revision 500.27  2003/10/09 03:17:02  ajc
 * Started prettying up the vCard display.
 
@@ -1591,4 +1596,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
-
diff --git a/webcit/calendar.c b/webcit/calendar.c
index a52c9a057..9185c3edb 100644
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -106,8 +106,8 @@ void cal_process_object(icalcomponent *cal,
 				"<IMG ALIGN=CENTER "
 				"SRC=\"/static/vcalendar.gif\">"
 				"&nbsp;&nbsp;"	
-				"<B>Meeting invitation</B>
-				</TD></TR>\n"
+				"<B>Meeting invitation</B>"
+				"</TD></TR>\n"
 			);
 			break;
 		    case ICAL_METHOD_REPLY:
@@ -115,8 +115,8 @@ void cal_process_object(icalcomponent *cal,
 				"<IMG ALIGN=CENTER "
 				"SRC=\"/static/vcalendar.gif\">"
 				"&nbsp;&nbsp;"	
-				"<B>Attendee's reply to your invitation</B>
-				</TD></TR>\n"
+				"<B>Attendee's reply to your invitation</B>"
+				"</TD></TR>\n"
 			);
 			break;
 		    case ICAL_METHOD_PUBLISH:
@@ -124,8 +124,8 @@ void cal_process_object(icalcomponent *cal,
 				"<IMG ALIGN=CENTER "
 				"SRC=\"/static/vcalendar.gif\">"
 				"&nbsp;&nbsp;"	
-				"<B>Published event</B>
-				</TD></TR>\n"
+				"<B>Published event</B>"
+				"</TD></TR>\n"
 			);
 			break;
 		    default:
diff --git a/webcit/event.c b/webcit/event.c
index 3b70eedd9..fef2275ab 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -366,33 +366,33 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
 	wprintf("</FORM>\n");
 	
-	wprintf("<SCRIPT language=\"javascript\">
-		<!--
-			if (document.EventForm.alldayevent.checked) {
-				document.EventForm.dtstart_hour.value='0';
-				document.EventForm.dtstart_hour.disabled = true;
-				document.EventForm.dtstart_minute.value='0';
-				document.EventForm.dtstart_minute.disabled = true;
-				document.EventForm.dtend_hour.value='0';
-				document.EventForm.dtend_hour.disabled = true;
-				document.EventForm.dtend_minute.value='0';
-				document.EventForm.dtend_minute.disabled = true;
-				document.EventForm.dtend_month.disabled = true;
-				document.EventForm.dtend_day.disabled = true;
-				document.EventForm.dtend_year.disabled = true;
-			}
-			else {
-				document.EventForm.dtstart_hour.disabled = false;
-				document.EventForm.dtstart_minute.disabled = false;
-				document.EventForm.dtend_hour.disabled = false;
-				document.EventForm.dtend_minute.disabled = false;
-				document.EventForm.dtend_month.disabled = false;
-				document.EventForm.dtend_day.disabled = false;
-				document.EventForm.dtend_year.disabled = false;
-			}
-		//-->
-		</SCRIPT>
-	");
+	wprintf("<SCRIPT language=\"javascript\">"
+		"<!--"
+			"if (document.EventForm.alldayevent.checked) {"
+				"document.EventForm.dtstart_hour.value='0';"
+				"document.EventForm.dtstart_hour.disabled = true;"
+				"document.EventForm.dtstart_minute.value='0';"
+				"document.EventForm.dtstart_minute.disabled = true;"
+				"document.EventForm.dtend_hour.value='0';"
+				"document.EventForm.dtend_hour.disabled = true;"
+				"document.EventForm.dtend_minute.value='0';"
+				"document.EventForm.dtend_minute.disabled = true;"
+				"document.EventForm.dtend_month.disabled = true;"
+				"document.EventForm.dtend_day.disabled = true;"
+				"document.EventForm.dtend_year.disabled = true;"
+			"}"
+			"else {"
+				"document.EventForm.dtstart_hour.disabled = false;"
+				"document.EventForm.dtstart_minute.disabled = false;"
+				"document.EventForm.dtend_hour.disabled = false;"
+				"document.EventForm.dtend_minute.disabled = false;"
+				"document.EventForm.dtend_month.disabled = false;"
+				"document.EventForm.dtend_day.disabled = false;"
+				"document.EventForm.dtend_year.disabled = false;"
+			"}"
+		"//-->"
+		"</SCRIPT>\n"
+	);
 
 	do_template("endbox");
 	wDumpContent(1);
diff --git a/webcit/setup.c b/webcit/setup.c
index 9706bafce..2bb76df2b 100644
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -229,10 +229,8 @@ void set_value(char *prompt, char str[])
 	int i;
 #endif
 	char buf[SIZ];
-	char tempfile[PATH_MAX];
 	char setupmsg[SIZ];
 
-	strcpy(tempfile, tmpnam(NULL));
 	strcpy(setupmsg, "");
 
 	switch (setup_type) {