[master] 2cdfba0 Also rename the function calls.

Poul-Henning Kamp phk at varnish-cache.org
Fri Sep 6 09:00:39 CEST 2013


commit 2cdfba04e60a903424673879ef762c14bf86a88e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Sep 5 12:51:39 2013 +0000

    Also rename the function calls.

diff --git a/bin/varnishd/cache/cache_http1_deliver.c b/bin/varnishd/cache/cache_http1_deliver.c
index d758ce5..beac565 100644
--- a/bin/varnishd/cache/cache_http1_deliver.c
+++ b/bin/varnishd/cache/cache_http1_deliver.c
@@ -282,7 +282,7 @@ v1d_WriteObj(struct req *req)
 	    cache_param->http_range_support &&
 	    req->obj->response == 200 &&
 	    http_GetHdr(req->http, H_Range, &r))
-		res_dorange(req, r, &low, &high);
+		v1d_dorange(req, r, &low, &high);
 
 	WRW_Reserve(req->wrk, &req->sp->fd, req->vsl, req->t_resp);
 
@@ -309,11 +309,11 @@ v1d_WriteObj(struct req *req)
 		ESI_DeliverChild(req);
 	} else if (req->res_mode & RES_ESI_CHILD &&
 	    !req->gzip_resp && req->obj->gziped) {
-		res_WriteGunzipObj(req);
+		v1d_WriteGunzipObj(req);
 	} else if (req->res_mode & RES_GUNZIP) {
-		res_WriteGunzipObj(req);
+		v1d_WriteGunzipObj(req);
 	} else {
-		res_WriteDirObj(req, low, high);
+		v1d_WriteDirObj(req, low, high);
 	}
 
 	if (req->res_mode & RES_CHUNKED &&
@@ -330,6 +330,6 @@ V1D_Deliver(struct req *req)
 	while (req->obj->objcore->busyobj)
 		(void)usleep(10000);
 	
-	RES_BuildHttp(req);
-	RES_WriteObj(req);
+	v1d_BuildHttp(req);
+	v1d_WriteObj(req);
 }



More information about the varnish-commit mailing list