[project @ 2004-08-14 12:57:00 by joty]

Using more stddef.h types.

svn path=/import/netsurf/; revision=1230

5 files changed, 18 insertions, 19 deletions

diff --git a/riscos/font.c b/riscos/font.c
index 6e2064438..ef2ecb5a6 100644
--- a/riscos/font.c
+++ b/riscos/font.c
@@ -414,7 +414,7 @@ void nsfont_free_set(struct font_set *set)
  * \return width of text in pixels
  */
 unsigned long nsfont_width(struct font_data *font, const char *text,
-		unsigned int length)
+		size_t length)
 {
 	int width;
 	os_error *error;
@@ -487,7 +487,7 @@ unsigned long nsfont_width(struct font_data *font, const char *text,
  * \param pixel_offset updated to give the coordinate of the character in pixels
  */
 void nsfont_position_in_string(struct font_data *font, const char *text,
-		unsigned int length, unsigned long x,
+		size_t length, unsigned long x,
 		int *char_offset, int *pixel_offset)
 {
 	os_error *error;
@@ -568,8 +568,7 @@ void nsfont_position_in_string(struct font_data *font, const char *text,
  * \return pointer to character which does not fit
  */
 char *nsfont_split(struct font_data *font, const char *text,
-		unsigned int length,
-		unsigned int width, unsigned int *used_width)
+		size_t length, unsigned int width, unsigned int *used_width)
 {
 	os_error *error;
 	font_scan_block block;
@@ -645,7 +644,7 @@ char *nsfont_split(struct font_data *font, const char *text,
 
 
 void nsfont_paint(struct font_data *data, const char *text,
-		int xpos, int ypos, void *trfm, int length)
+		size_t length, int xpos, int ypos, void *trfm)
 {
 	os_error *error;
 	unsigned int flags;
@@ -679,7 +678,7 @@ void nsfont_paint(struct font_data *data, const char *text,
 	xos_read_vdu_variables((const os_vdu_var_list *)&var_input, (int *)&var_output);
 	xpos += var_output[0];
 	ypos += var_output[1];
-	
+
 
 	switch (data->ftype) {
 		case FONTTYPE_UFONT:
@@ -728,12 +727,12 @@ void nsfont_paint(struct font_data *data, const char *text,
  * \param consumed number of bytes of the given text which can be set with one RISC OS font. If 0, then error happened or initial text length was 0.
  */
 void nsfont_txtenum(struct font_data *font, const char *text,
-		unsigned int length,
+		size_t length,
 		unsigned int *width,
 		const char **rofontname,
 		const char **rotext,
-		unsigned int *rolength,
-		unsigned int *consumed)
+		size_t *rolength,
+		size_t *consumed)
 {
 	assert(font != NULL && text != NULL && rofontname != NULL && rotext != NULL && rolength != NULL && consumed != NULL);
 
diff --git a/riscos/gui.h b/riscos/gui.h
index d667a9148..ef500cfd0 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -11,6 +11,7 @@
 #define _NETSURF_RISCOS_GUI_H_
 
 #include <stdbool.h>
+#include <stdlib.h>
 #include "oslib/osspriteop.h"
 #include "oslib/wimp.h"
 #include "netsurf/utils/config.h"
diff --git a/riscos/htmlredraw.c b/riscos/htmlredraw.c
index e037ac86e..d9060563d 100644
--- a/riscos/htmlredraw.c
+++ b/riscos/htmlredraw.c
@@ -530,13 +530,13 @@ bool html_redraw_box(struct box *box,
 		}
 
 		if (scale == 1)
-			nsfont_paint(box->font, box->text,
+			nsfont_paint(box->font, box->text, box->length,
 					x, y - (int) (box->height * 1.5),
-					NULL, (int) box->length);
+					NULL);
 		else
-			nsfont_paint(box->font, box->text,
+			nsfont_paint(box->font, box->text, box->length,
 					x, y - (int) (box->height * 1.5 * scale),
-					&trfm, (int) box->length);
+					&trfm);
 
 
 	} else {
@@ -832,7 +832,7 @@ bool html_redraw_file(int x, int y, int width, int height,
 	int text_width;
 	const char *text;
 	const char *sprite;
-	int length;
+	size_t length;
 
 	if (box->gadget->value) {
 		text = box->gadget->value;
@@ -849,8 +849,7 @@ bool html_redraw_file(int x, int y, int width, int height,
 	else
 		x = x + 4;
 
-	nsfont_paint(box->font, text,
-			x, y - height * 0.75, &trfm, length);
+	nsfont_paint(box->font, text, length, x, y - height * 0.75, &trfm);
 
 /*	xwimpspriteop_put_sprite_user_coords(sprite, x + 4, */
 /*			y - height / 2 - 17, os_ACTION_OVERWRITE); */
diff --git a/riscos/print.c b/riscos/print.c
index 97991c1c1..ddb92963d 100644
--- a/riscos/print.c
+++ b/riscos/print.c
@@ -700,8 +700,8 @@ bool print_find_fonts(struct box *box, struct print_font **print_fonts, int *num
 {
 	struct box *a;
 	const char *txt;
-	int txt_len;
-	unsigned int width, rolength, consumed;
+	size_t txt_len;
+	size_t width, rolength, consumed;
 	const char *rofontname, *rotext;
 	int i;
 
diff --git a/riscos/save_draw.c b/riscos/save_draw.c
index 9f71c05c5..469d5a3d5 100644
--- a/riscos/save_draw.c
+++ b/riscos/save_draw.c
@@ -1021,7 +1021,7 @@ static bool add_text(struct box *box, os_colour cbc, os_colour fc,
 	size_t txt_len = box->length;
 
 	while (txt_len != 0) {
-		unsigned int width, rolength, consumed;
+		size_t width, rolength, consumed;
 		const char *rofontname, *rotext;
 		byte fontIndex;
 		drawfile_object *dro;