Skip to content

U
unique-xids
Commit 91734c47 authored by Tollef Fog Heen's avatar Tollef Fog Heen
Browse files
Options

WRK_Flush was renamed to WRW_Flush a long time ago; update some ifdefed code and comments to match

parent 4620b270
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
bin/varnishd/cache.h
View file @ 91734c47
...@@ -255,7 +255,7 @@ struct exp { ...@@ -255,7 +255,7 @@ struct exp {
struct wrw { struct wrw {
int *wfd; int *wfd;
unsigned werr; /* valid after WRK_Flush() */ unsigned werr; /* valid after WRW_Flush() */
struct iovec *iov; struct iovec *iov;
unsigned siov; unsigned siov;
unsigned niov; unsigned niov;
......
bin/varnishd/cache_wrw.c
View file @ 91734c47
...@@ -264,7 +264,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len) ...@@ -264,7 +264,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
} while (0); } while (0);
#elif defined(__linux__) #elif defined(__linux__)
do { do {
if (WRK_Flush(w) == 0 && if (WRW_Flush(w) == 0 &&
sendfile(*wrw->wfd, fd, &off, len) != len) sendfile(*wrw->wfd, fd, &off, len) != len)
wrw->werr++; wrw->werr++;
} while (0); } while (0);
...@@ -293,7 +293,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len) ...@@ -293,7 +293,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
} while (0); } while (0);
#elif defined(__sun) && defined(HAVE_SENDFILE) #elif defined(__sun) && defined(HAVE_SENDFILE)
do { do {
if (WRK_Flush(w) == 0 && if (WRW_Flush(w) == 0 &&
sendfile(*wrw->wfd, fd, &off, len) != len) sendfile(*wrw->wfd, fd, &off, len) != len)
wrw->werr++; wrw->werr++;
} while (0); } while (0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment