diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 23:33:22 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:55 +0100 |
| commit | 509e82e402d64c79f27c9a10d75b100a1ac5fefa (patch) | |
| tree | a7770d609512848c17f413764e9dc0bd43acce5d /source4/web_server | |
| parent | da0f222f432c4fc8bf5da80baf849ca32b315ca0 (diff) | |
| download | samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.tar.gz samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.tar.bz2 samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.zip | |
r26272: Remove global_loadparm in some more places.
(This used to be commit 1ab76ecc5311fa863e5d04899b6f110899818f55)
Diffstat (limited to 'source4/web_server')
| -rw-r--r-- | source4/web_server/http.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/web_server/http.c b/source4/web_server/http.c index 558cc79eb9..bd6efa9262 100644 --- a/source4/web_server/http.c +++ b/source4/web_server/http.c @@ -139,7 +139,8 @@ static int http_readFile(EspHandle handle, const char *path, const char *base_dir) { - struct websrv_context *web = talloc_get_type(handle, struct websrv_context); + struct websrv_context *web = talloc_get_type(handle, + struct websrv_context); int fd = -1; struct stat st; *buf = NULL; @@ -169,12 +170,11 @@ failed: return -1; } -static int http_readFileFromSwatDir(EspHandle handle, - char **buf, - int *len, +static int http_readFileFromSwatDir(EspHandle handle, char **buf, int *len, const char *path) { - return http_readFile(handle, buf, len, path, lp_swat_directory(global_loadparm)); + return http_readFile(handle, buf, len, path, + lp_swat_directory(global_loadparm)); } |