summaryrefslogtreecommitdiff
path: root/riscos/gui.c
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2010-04-30 16:06:03 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2010-04-30 16:06:03 +0000
commit5e887908b34b804a19b2b7370b0aa358d0e55973 (patch)
tree68935c8d2fe196a64a17bace1508884d538a5e17 /riscos/gui.c
parentf0237aac922a3ee5b14233fa98baf19df97866ed (diff)
downloadnetsurf-5e887908b34b804a19b2b7370b0aa358d0e55973.tar.gz
netsurf-5e887908b34b804a19b2b7370b0aa358d0e55973.tar.bz2
Consolidate several 'myrealloc' functions into ns_realloc, rename one which *is* different, thereby eliminating the word 'myrealloc' from the NS codebase
svn path=/trunk/netsurf/; revision=10530
Diffstat (limited to 'riscos/gui.c')
-rw-r--r--riscos/gui.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/riscos/gui.c b/riscos/gui.c
index d3148529c..eaba7bf58 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -271,17 +271,6 @@ static void ro_msg_save_desktop(wimp_message *message);
static void ro_msg_window_info(wimp_message *message);
static void ro_gui_view_source_bounce(wimp_message *message);
-static void *myrealloc(void *ptr, size_t len, void *pw)
-{
- if (len == 0) {
- free(ptr);
- return NULL;
- }
-
- return realloc(ptr, len);
-}
-
-
/**
* Initialise the gui (RISC OS specific part).
*/
@@ -321,7 +310,7 @@ static void gui_init(int argc, char** argv)
ro_plot_patterned_lines = false;
}
- if (hubbub_initialise("NetSurf:Resources.Aliases", myrealloc, NULL) !=
+ if (hubbub_initialise("NetSurf:Resources.Aliases", ns_realloc, NULL) !=
HUBBUB_OK)
die("Failed to initialise HTML parsing library.");
@@ -802,7 +791,7 @@ void gui_quit(void)
free(quirks_stylesheet_url);
free(adblock_stylesheet_url);
/* We don't care if this fails */
- hubbub_finalise(myrealloc, NULL);
+ hubbub_finalise(ns_realloc, NULL);
xhourglass_off();
}