[3.0] 12d4a11 WRK_Flush was renamed to WRW_Flush a long time ago; update some ifdefed code and comments to match
Tollef Fog Heen
tfheen at varnish-cache.org
Mon Apr 16 10:20:33 CEST 2012
commit 12d4a11f66a3f2ca2e3908d0fbaa776c8ef02037
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date: Mon Oct 10 08:14:31 2011 +0200
WRK_Flush was renamed to WRW_Flush a long time ago; update some ifdefed code and comments to match
diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
index 3d6982d..a00e5e1 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
@@ -260,7 +260,7 @@ struct exp {
struct wrw {
int *wfd;
- unsigned werr; /* valid after WRK_Flush() */
+ unsigned werr; /* valid after WRW_Flush() */
struct iovec *iov;
unsigned siov;
unsigned niov;
diff --git a/bin/varnishd/cache_wrw.c b/bin/varnishd/cache_wrw.c
index 61aa2e5..f25bafb 100644
--- a/bin/varnishd/cache_wrw.c
+++ b/bin/varnishd/cache_wrw.c
@@ -264,7 +264,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
} while (0);
#elif defined(__linux__)
do {
- if (WRK_Flush(w) == 0 &&
+ if (WRW_Flush(w) == 0 &&
sendfile(*wrw->wfd, fd, &off, len) != len)
wrw->werr++;
} while (0);
@@ -293,7 +293,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
} while (0);
#elif defined(__sun) && defined(HAVE_SENDFILE)
do {
- if (WRK_Flush(w) == 0 &&
+ if (WRW_Flush(w) == 0 &&
sendfile(*wrw->wfd, fd, &off, len) != len)
wrw->werr++;
} while (0);
More information about the varnish-commit
mailing list