hubbub_alloc -> hubbub_allocator_fn

svn path=/trunk/hubbub/; revision=7043

3 files changed, 4 insertions, 4 deletions

diff --git a/include/hubbub/functypes.h b/include/hubbub/functypes.h
index f7f2467..021c403 100644
--- a/include/hubbub/functypes.h
+++ b/include/hubbub/functypes.h
@@ -24,7 +24,7 @@
  * \param pw    Pointer to client data
  * \return Pointer to allocated object, or NULL on failure
  */
-typedef void *(*hubbub_alloc)(void *ptr, size_t size, void *pw);
+typedef void *(*hubbub_allocator_fn)(void *ptr, size_t size, void *pw);
 
 /**
  * Type of token handling function
diff --git a/include/hubbub/hubbub.h b/include/hubbub/hubbub.h
index 8a15eca..7de7e5c 100644
--- a/include/hubbub/hubbub.h
+++ b/include/hubbub/hubbub.h
@@ -14,10 +14,10 @@
 
 /* Initialise the Hubbub library for use */
 hubbub_error hubbub_initialise(const char *aliases_file,
-		hubbub_alloc alloc, void *pw);
+		hubbub_allocator_fn alloc, void *pw);
 
 /* Clean up after Hubbub */
-hubbub_error hubbub_finalise(hubbub_alloc alloc, void *pw);
+hubbub_error hubbub_finalise(hubbub_allocator_fn alloc, void *pw);
 
 #endif
 
diff --git a/include/hubbub/parser.h b/include/hubbub/parser.h
index 803ec21..5716d0d 100644
--- a/include/hubbub/parser.h
+++ b/include/hubbub/parser.h
@@ -57,7 +57,7 @@ typedef union hubbub_parser_optparams {
 
 /* Create a hubbub parser */
 hubbub_error hubbub_parser_create(const char *enc, bool fix_enc,
-		hubbub_alloc alloc, void *pw, hubbub_parser **parser);
+		hubbub_allocator_fn alloc, void *pw, hubbub_parser **parser);
 /* Destroy a hubbub parser */
 hubbub_error hubbub_parser_destroy(hubbub_parser *parser);