r2473 - in trunk/varnish-cache: bin/varnishd include lib/libvarnish

phk at projects.linpro.no phk at projects.linpro.no
Fri Feb 15 11:57:20 CET 2008


Author: phk
Date: 2008-02-15 11:57:20 +0100 (Fri, 15 Feb 2008)
New Revision: 2473

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_child.c
   trunk/varnish-cache/include/vlu.h
   trunk/varnish-cache/lib/libvarnish/vlu.c
Log:
A Give VLU_New() an optional buffersize argument


Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2008-02-15 10:36:21 UTC (rev 2472)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2008-02-15 10:57:20 UTC (rev 2473)
@@ -229,7 +229,7 @@
 	AZ(close(child_fds[1]));
 	child_fds[1] = -1;
 
-	vlu = VLU_New(NULL, child_line);
+	vlu = VLU_New(NULL, child_line, 0);
 	AN(vlu);
 
 	AZ(ev_listen);

Modified: trunk/varnish-cache/include/vlu.h
===================================================================
--- trunk/varnish-cache/include/vlu.h	2008-02-15 10:36:21 UTC (rev 2472)
+++ trunk/varnish-cache/include/vlu.h	2008-02-15 10:57:20 UTC (rev 2473)
@@ -33,7 +33,7 @@
 #define VLU_H_INCLUDED
 
 typedef int (vlu_f)(void *, const char *);
-struct vlu *VLU_New(void *priv, vlu_f *func);
+struct vlu *VLU_New(void *priv, vlu_f *func, unsigned bufsize);
 int VLU_Fd(int fd, struct vlu *l);
 int VLU_File(FILE *f, struct vlu *l);
 void VLU_Destroy(struct vlu *l);

Modified: trunk/varnish-cache/lib/libvarnish/vlu.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vlu.c	2008-02-15 10:36:21 UTC (rev 2472)
+++ trunk/varnish-cache/lib/libvarnish/vlu.c	2008-02-15 10:57:20 UTC (rev 2473)
@@ -48,15 +48,17 @@
 };
 
 struct vlu *
-VLU_New(void *priv, vlu_f *func)
+VLU_New(void *priv, vlu_f *func, unsigned bufsize)
 {
 	struct vlu *l;
 
+	if (bufsize == 0)
+		bufsize = BUFSIZ;
 	ALLOC_OBJ(l, LINEUP_MAGIC);
 	if (l != NULL) {
 		l->func = func;
 		l->priv = priv;
-		l->bufl = BUFSIZ - 1;
+		l->bufl = bufsize - 1;
 		l->buf = malloc(l->bufl + 1);
 		if (l->buf == NULL) {
 			FREE_OBJ(l);




More information about the varnish-commit mailing list