X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdownloads.c;h=137a6389dafb0e3951dc607c295d017ed9d3006c;hb=23fcabeb4944b5e79e80a37127ed84ec8a639ed8;hp=3bd86350ea88510de31380b9f9a98f2a3b485a93;hpb=8e165dd308679f195af8614d62dbdb4e43238495;p=citadel.git

diff --git a/webcit/downloads.c b/webcit/downloads.c
index 3bd86350e..137a6389d 100644
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -175,7 +175,7 @@ HashList* LoadFileList(StrBuf *Target, WCTemplputParams *TP)
 	int HavePic;
 	WCTemplputParams SubTP;
 
-	memset(&TP, 0, sizeof(WCTemplputParams));
+	memset(&SubTP, 0, sizeof(WCTemplputParams));
 	serv_puts("RDIR");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') return NULL;
@@ -259,7 +259,7 @@ void download_file(void)
 		if (!force_download) {
 			StrBufExtract_token(ContentType, Buf, 3, '|');
 		}
-		read_server_binary(WCC->WBuf, bytes, Buf);
+		serv_read_binary(WCC->WBuf, bytes, Buf);
 		serv_puts("CLOS");
 		StrBuf_ServGetln(Buf);
 		http_transmit_thing(ChrPtr(ContentType), 0);
@@ -360,15 +360,17 @@ void output_image(void)
 	serv_printf("OIMG %s|%s", bstr("name"), bstr("parm"));
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) == 2) {
+		int rc;
 		StrBufCutLeft(Buf, 4);
 		bytes = StrBufExtract_long(Buf, 0, '|');
 
 		/** Read it from the server */
 		
-		if (read_server_binary(WCC->WBuf, bytes, Buf) > 0) {
-			serv_puts("CLOS");
-			StrBuf_ServGetln(Buf);
+		rc = serv_read_binary(WCC->WBuf, bytes, Buf);
+		serv_puts("CLOS");
+		StrBuf_ServGetln(Buf);
 		
+		if (rc > 0) {
 			MimeType = GuessMimeType (ChrPtr(WCC->WBuf), StrLength(WCC->WBuf));
 			/** Write it to the browser */
 			if (!IsEmptyStr(MimeType))