summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-06-01 23:18:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:23 -0500
commitb60ea955471ef8a0c733a7eb9114787030ccae60 (patch)
tree83efc6940fe60920ffb563d005a6d8faafb76e8d
parentcbf0a4c362fc292518400a9ccf38a5d3d8ce80f6 (diff)
downloadsamba-b60ea955471ef8a0c733a7eb9114787030ccae60.tar.gz
samba-b60ea955471ef8a0c733a7eb9114787030ccae60.tar.bz2
samba-b60ea955471ef8a0c733a7eb9114787030ccae60.zip
r7179: remove compiler warnings
metze (This used to be commit 0e1b1c393718cbffea391ba753cf19d359ff36d6)
-rw-r--r--source4/web_server/http.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index 5e47e9b50e..90b7c4571b 100644
--- a/source4/web_server/http.c
+++ b/source4/web_server/http.c
@@ -104,8 +104,7 @@ static void http_output_headers(struct websrv_context *web)
if (s == NULL) return;
b = web->output.content;
- web->output.content.data = s;
- web->output.content.length = strlen(s);
+ web->output.content = data_blob_string_const(s);
data_blob_append(web, &web->output.content, b.data, b.length);
data_blob_free(&b);
}
@@ -486,7 +485,7 @@ void ejs_exception(const char *reason)
static void esp_request(struct esp_state *esp, const char *url)
{
struct websrv_context *web = esp->web;
- size_t size;
+ ssize_t size;
int res;
char *emsg = NULL, *buf;
@@ -599,7 +598,7 @@ static NTSTATUS http_parse_post(struct esp_state *esp)
} else {
len = p - (char *)b.data;
}
- line = talloc_strndup(esp, b.data, len);
+ line = talloc_strndup(esp, (char *)b.data, len);
NT_STATUS_HAVE_NO_MEMORY(line);
p = strchr(line,'=');