change content get_source_data interfaces to return uint8_t and size_t

previously these interfaces returned char * and unsigned int which was
undesirable.

3 files changed, 14 insertions, 5 deletions

diff --git a/content/handlers/javascript/duktape/dukky.c b/content/handlers/javascript/duktape/dukky.c
index d1bd4ec49..e9e579d4d 100644
--- a/content/handlers/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
@@ -761,10 +761,16 @@ void dukky_push_generics(duk_context *ctx, const char *generic)
 	/* ..., generic */
 }
 
-bool js_exec(jscontext *ctx, const char *txt, size_t txtlen, const char *name)
+/* exported interface documented in js.h */
+bool
+js_exec(jscontext *ctx, const uint8_t *txt, size_t txtlen, const char *name)
 {
 	assert(ctx);
-	if (txt == NULL || txtlen == 0) return false;
+
+	if (txt == NULL || txtlen == 0) {
+		return false;
+	}
+
 	duk_set_top(CTX, 0);
 	NSLOG(dukky, DEEPDEBUG, "Running %"PRIsizet" bytes from %s", txtlen, name);
 	/* NSLOG(dukky, DEEPDEBUG, "\n%s\n", txt); */
@@ -775,7 +781,10 @@ bool js_exec(jscontext *ctx, const char *txt, size_t txtlen, const char *name)
 	} else {
 		duk_push_string(CTX, "?unknown source?");
 	}
-	if (duk_pcompile_lstring_filename(CTX, DUK_COMPILE_EVAL, txt, txtlen) != 0) {
+	if (duk_pcompile_lstring_filename(CTX,
+					  DUK_COMPILE_EVAL,
+					  (const char *)txt,
+					  txtlen) != 0) {
 		NSLOG(dukky, INFO, "Failed to compile JavaScript input");
 		goto handle_error;
 	}
diff --git a/content/handlers/javascript/js.h b/content/handlers/javascript/js.h
index 89a87afe3..31ab8f766 100644
--- a/content/handlers/javascript/js.h
+++ b/content/handlers/javascript/js.h
@@ -67,7 +67,7 @@ void js_destroycontext(jscontext *ctx);
 jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv);
 
 /* execute some javascript in a context */
-bool js_exec(jscontext *ctx, const char *txt, size_t txtlen, const char *name);
+bool js_exec(jscontext *ctx, const uint8_t *txt, size_t txtlen, const char *name);
 
 
 /* fire an event at a dom node */
diff --git a/content/handlers/javascript/none/none.c b/content/handlers/javascript/none/none.c
index e1c992ebf..80a9ce49c 100644
--- a/content/handlers/javascript/none/none.c
+++ b/content/handlers/javascript/none/none.c
@@ -51,7 +51,7 @@ jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
 	return NULL;
 }
 
-bool js_exec(jscontext *ctx, const char *txt, size_t txtlen, const char *name)
+bool js_exec(jscontext *ctx, const uint8_t *txt, size_t txtlen, const char *name)
 {
 	return true;
 }