[project @ 2004-08-14 14:30:10 by joty]

Removed a chunk of Norcroft compiler warnings.  Re-ident some pieces.

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

3 files changed, 34 insertions, 32 deletions

diff --git a/riscos/buffer.c b/riscos/buffer.c
index b77d6957a..b791afb35 100644
--- a/riscos/buffer.c
+++ b/riscos/buffer.c
@@ -18,18 +18,18 @@
 
 /*	SCREEN BUFFERING
 	================
-	
+
 	Because RISC OS provides no native way for windows to be buffered (ie
 	the contents is only updated when the task has finished doing any
 	drawing) certain situation cause the window contents to flicker in an
 	undesirable manner. Examples of this are GIF and MNG animations, and
 	web pages with fixed backgrounds.
-	
+
 	To overcome this, a very simple, transparent, interface is provided here
 	to allow for output to be buffered. It should be noted that screen
 	buffering can lower the perceived client response time as the user is
 	unable to see that the application is doing anything.
-	
+
 	[rjw] - Mon 19th July 2004
 */
 
@@ -104,13 +104,14 @@ void ro_gui_buffer_open(wimp_draw *redraw) {
 	buffer->sprite_count = 0;
 	buffer->first = 16;
 	buffer->used = 16;
-	
+
 	/*	Fill in the sprite header details
 	*/
 	sprintf(name, "buffer");
-	if ((error = xosspriteop_get_sprite_user_coords(osspriteop_NAME, buffer,
-			name, palette,
-			clipping.x0, clipping.y0, clipping.x1, clipping.y1))) {
+	if ((error = xosspriteop_get_sprite_user_coords(osspriteop_NAME,
+			buffer, name, palette,
+			clipping.x0, clipping.y0,
+			clipping.x1, clipping.y1)) != NULL) {
 //		LOG(("Grab error '%s'", error->errmess));
 		free(buffer);
 		buffer = NULL;
@@ -119,14 +120,14 @@ void ro_gui_buffer_open(wimp_draw *redraw) {
 
 	/*	Allocate OS_SpriteOp save area
 	*/
-	if ((error = xosspriteop_read_save_area_size(osspriteop_NAME, buffer,
-			(osspriteop_id)name, &size))) {
+	if ((error = xosspriteop_read_save_area_size(osspriteop_NAME,
+			buffer, (osspriteop_id)name, &size)) != NULL) {
 //		LOG(("Save area error '%s'", error->errmess));
 		free(buffer);
 		buffer = NULL;
 		return;
 	}
-	if (!(save_area = malloc((unsigned)size))) {
+	if ((save_area = malloc((size_t)size)) == NULL) {
 		free(buffer);
 		buffer = NULL;
 		return;
@@ -135,9 +136,10 @@ void ro_gui_buffer_open(wimp_draw *redraw) {
 
 	/*	Switch output to sprite
 	*/
-	if ((error = xosspriteop_switch_output_to_sprite(osspriteop_NAME, buffer,
-			(osspriteop_id)name, save_area,
-			0, (int *)&context1, (int *)&context2, (int *)&context3))) {
+	if ((error = xosspriteop_switch_output_to_sprite(osspriteop_NAME,
+			buffer, (osspriteop_id)name, save_area, 0,
+			(int *)&context1, (int *)&context2,
+			(int *)&context3)) != NULL) {
 //		LOG(("Switching error '%s'", error->errmess));
 		free(save_area);
 		free(buffer);
@@ -161,7 +163,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) {
  * Closes any open buffer and flushes the contents to screen
  */
 void ro_gui_buffer_close(void) {
-  
+
 	/*	Check we have an open buffer
 	*/
 	if (!buffer) return;
@@ -178,7 +180,7 @@ void ro_gui_buffer_close(void) {
 	xosspriteop_put_sprite_user_coords(osspriteop_NAME,
 		buffer, (osspriteop_id)name,
 		clipping.x0, clipping.y0, (os_action)0);
-		
+
 	/*	Free our memory
 	*/
 	free(buffer);
diff --git a/riscos/gui.c b/riscos/gui.c
index 82cc07f49..43c06ede6 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -692,7 +692,7 @@ void ro_gui_redraw_window_request(wimp_draw *redraw)
 		ro_gui_hotlist_redraw(redraw);
 	else if (redraw->w == dialog_debug)
 		ro_gui_debugwin_redraw(redraw);
-	else if ((g = ro_gui_window_lookup(redraw->w)))
+	else if ((g = ro_gui_window_lookup(redraw->w)) != NULL)
 		ro_gui_window_redraw(g, redraw);
 	else {
 		error = xwimp_redraw_window(redraw, &more);
@@ -760,9 +760,9 @@ void ro_gui_close_window_request(wimp_close *close)
 
 	if (close->w == dialog_debug)
 		ro_gui_debugwin_close();
-	else if ((g = ro_gui_window_lookup(close->w)))
+	else if ((g = ro_gui_window_lookup(close->w)) != NULL)
 		browser_window_destroy(g->bw);
-	else if ((dw = ro_gui_download_window_lookup(close->w)))
+	else if ((dw = ro_gui_download_window_lookup(close->w)) != NULL)
 		ro_gui_download_window_destroy(dw);
 	else
 		ro_gui_dialog_close(close->w);
@@ -823,13 +823,13 @@ void ro_gui_mouse_click(wimp_pointer *pointer)
 	else if (hotlist_toolbar &&
 			hotlist_toolbar->toolbar_handle == pointer->w)
 		ro_gui_hotlist_toolbar_click(pointer);
-	else if ((g = ro_gui_window_lookup(pointer->w)))
+	else if ((g = ro_gui_window_lookup(pointer->w)) != NULL)
 		ro_gui_window_click(g, pointer);
-	else if ((g = ro_gui_toolbar_lookup(pointer->w)))
+	else if ((g = ro_gui_toolbar_lookup(pointer->w)) != NULL)
 		ro_gui_toolbar_click(g, pointer);
-	else if ((g = ro_gui_status_lookup(pointer->w)))
+	else if ((g = ro_gui_status_lookup(pointer->w)) != NULL)
 		ro_gui_status_click(g, pointer);
-	else if ((dw = ro_gui_download_window_lookup(pointer->w)))
+	else if ((dw = ro_gui_download_window_lookup(pointer->w)) != NULL)
 		ro_gui_download_window_click(dw, pointer);
 	else
 		ro_gui_dialog_click(pointer);
@@ -915,9 +915,9 @@ void ro_gui_keypress(wimp_key *key)
 
 	if (key->w == hotlist_window)
 		handled = ro_gui_hotlist_keypress(key->c);
-	else if ((g = ro_gui_window_lookup(key->w)))
+	else if ((g = ro_gui_window_lookup(key->w)) != NULL)
 		handled = ro_gui_window_keypress(g, key->c, false);
-	else if ((g = ro_gui_toolbar_lookup(key->w)))
+	else if ((g = ro_gui_toolbar_lookup(key->w)) != NULL)
 		handled = ro_gui_window_keypress(g, key->c, true);
         else
 		handled = ro_gui_dialog_keypress(key);
diff --git a/riscos/help.c b/riscos/help.c
index 1ba514f95..6a7f7a696 100644
--- a/riscos/help.c
+++ b/riscos/help.c
@@ -51,7 +51,7 @@
 	of numbers representing the menu structure (eg 'HelpBrowserMenu3-1-2').
 	If '<key><identifier>' is not available, then simply '<key>' is then used. For example
 	if 'HelpToolbar7' is not available then 'HelpToolbar' is then tried.
-	
+
 	If an item is greyed out then a suffix of 'g' is added (eg 'HelpToolbar7g'). For this to
 	work, windows must have bit 4 of the window flag byte set and the user must be running
 	RISC OS 5.03 or greater.
@@ -126,11 +126,11 @@ void ro_gui_interactive_help_request(wimp_message *message) {
 	} else if (hotlist_toolbar &&
 			window == hotlist_toolbar->toolbar_handle) {
 		sprintf(message_token, "HelpHotToolbar%i", (int)icon);
-	} else if ((g = ro_gui_window_lookup(window))) {
+	} else if ((g = ro_gui_window_lookup(window)) != NULL) {
 		sprintf(message_token, "HelpBrowser%i", (int)icon);
-	} else if ((g = ro_gui_toolbar_lookup(window))) {
+	} else if ((g = ro_gui_toolbar_lookup(window)) != NULL) {
 		sprintf(message_token, "HelpToolbar%i", (int)icon);
-	} else if ((g = ro_gui_status_lookup(window))) {
+	} else if ((g = ro_gui_status_lookup(window)) != NULL) {
 		sprintf(message_token, "HelpStatus%i", (int)icon);
 	}
 
@@ -142,7 +142,7 @@ void ro_gui_interactive_help_request(wimp_message *message) {
 		if ((icon >= 0) && (ro_gui_get_icon_shaded_state(window, icon))) {
 			strcat(message_token, "g");
 		}
-		
+
 		/*	Broadcast out message
 		*/
 		ro_gui_interactive_help_broadcast(message, &message_token[0]);
@@ -183,7 +183,7 @@ void ro_gui_interactive_help_request(wimp_message *message) {
 		*/
 		greyed |= test_menu->entries[menu_tree.items[index]].icon_flags & wimp_ICON_SHADED;
 		test_menu = test_menu->entries[menu_tree.items[index]].sub_menu;
-	  	
+
 		/*	Continue adding the entries
 		*/
 		if (index == 0) {
@@ -230,7 +230,7 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, char *token
 			base_token = token;
 			while (base_token[0] != 0x00) {
 				if ((base_token[0] == '-') ||
-						((base_token[0] >= '0') && (base_token[0] <= '9'))) {	
+						((base_token[0] >= '0') && (base_token[0] <= '9'))) {
 					base_token[0] = 0x00;
 				} else {
 					++base_token;
@@ -242,7 +242,7 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, char *token
 			translated_token = messages_get(token);
 		}
 	}
-	
+
 
 	/*	Copy our message string
 	*/