* move serv_func.c:read_server_binary() to tcp_sockets.c: serv_read_binary()

[citadel.git] / webcit / downloads.c

diff --git a/webcit/downloads.c b/webcit/downloads.c
index 8544aabb9db93a88d75e50fd00595fadb94e9799..137a6389dafb0e3951dc607c295d017ed9d3006c 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -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))