From 83346830688525a287489cc791299cbc945d4fc4 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sun, 2 Jan 2005 03:58:21 +0000 Subject: [project @ 2005-01-02 03:58:20 by jmb] xcalloc/xrealloc/xstrdup-purge - Lose remaining calls (and purge the relevant functions from utils.c) svn path=/import/netsurf/; revision=1419 --- riscos/uri.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'riscos/uri.c') diff --git a/riscos/uri.c b/riscos/uri.c index 04edc208f..4c0790398 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -32,43 +32,42 @@ extern wimp_t task_handle; void ro_uri_message_received(uri_full_message_process* uri_message) { - uri_h uri_handle; - char* uri_requested; - int uri_length; + uri_h uri_handle; + char* uri_requested; + int uri_length; - uri_handle = uri_message->handle; + uri_handle = uri_message->handle; - if (!fetch_can_fetch(uri_message->uri)) return; + if (!fetch_can_fetch(uri_message->uri)) return; - uri_message->your_ref = uri_message->my_ref; - uri_message->action = message_URI_PROCESS_ACK; + uri_message->your_ref = uri_message->my_ref; + uri_message->action = message_URI_PROCESS_ACK; - xwimp_send_message(wimp_USER_MESSAGE, - (wimp_message*)uri_message, - uri_message->sender); + xwimp_send_message(wimp_USER_MESSAGE, (wimp_message*)uri_message, + uri_message->sender); - xuri_request_uri(0, 0, 0, uri_handle, &uri_length); - uri_requested = calloc((unsigned int)uri_length, sizeof(char)); + xuri_request_uri(0, 0, 0, uri_handle, &uri_length); + uri_requested = calloc((unsigned int)uri_length, sizeof(char)); - if (uri_requested == NULL) - return; + if (uri_requested == NULL) + return; - xuri_request_uri(0, uri_requested, uri_length, uri_handle, NULL); + xuri_request_uri(0, uri_requested, uri_length, uri_handle, NULL); - browser_window_create(uri_requested, NULL, 0); + browser_window_create(uri_requested, NULL, 0); - xfree(uri_requested); + free(uri_requested); } -bool ro_uri_launch(char *uri) { - +bool ro_uri_launch(char *uri) +{ uri_h uri_handle; wimp_t handle_task; uri_dispatch_flags returned; os_error *e; e = xuri_dispatch(uri_DISPATCH_INFORM_CALLER, uri, task_handle, - &returned, &handle_task, &uri_handle); + &returned, &handle_task, &uri_handle); if (e || returned & 1) { return false; @@ -77,8 +76,8 @@ bool ro_uri_launch(char *uri) { return true; } -void ro_uri_bounce(uri_full_message_return_result *message) { - +void ro_uri_bounce(uri_full_message_return_result *message) +{ char uri_buf[512]; os_error *e; @@ -87,8 +86,8 @@ void ro_uri_bounce(uri_full_message_return_result *message) { e = xuri_request_uri(0, uri_buf, sizeof uri_buf, message->handle, 0); if (e) { - LOG(("xuri_request_uri: %d: %s", e->errnum, e->errmess)); - return; + LOG(("xuri_request_uri: %d: %s", e->errnum, e->errmess)); + return; } ro_url_load(uri_buf); -- cgit v1.2.3