From c53e068e1821faf757efb26a5caf8297d2a88c26 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Wed, 8 Jul 2015 19:57:45 +0200
Subject: [PATCH] ABI cleanups

---
 maint/abi-map-symbols |  2 +-
 maint/libucw.abi      | 40 +++++++++++++++++++++++++++++++---------
 ucw-json/json.h       | 18 +++++++++++++++++-
 ucw/fw-hex.h          |  3 ++-
 ucw/mempool.h         |  1 +
 5 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/maint/abi-map-symbols b/maint/abi-map-symbols
index 298ad0f4..d3c23556 100755
--- a/maint/abi-map-symbols
+++ b/maint/abi-map-symbols
@@ -79,7 +79,7 @@ my %blacklist = map { $_ => 1 } qw(
 	images/scale-gen.h
 );
 
-for my $f (<ucw/*.h>, <ucw/sorter/common.h>, <charset/*.h>, <images/*.h>, <ucw-xml/*.h>) {
+for my $f (<ucw/*.h>, <ucw/sorter/common.h>, <charset/*.h>, <images/*.h>, <ucw-xml/*.h>, <ucw-json/*.h>) {
 	next if $blacklist{$f};
 	parse($f);
 }
diff --git a/maint/libucw.abi b/maint/libucw.abi
index b103e584..9b8c2b53 100644
--- a/maint/libucw.abi
+++ b/maint/libucw.abi
@@ -212,6 +212,9 @@ bput_utf16_le_slow
 # ucw/ff-varint.h
 bget_varint_slow
 bput_varint_slow
+# ucw/fw-hex.h
+fb_wrap_hex_out
+fb_wrap_hex_in
 # ucw/gary.h
 gary_init
 gary_set_size
@@ -376,6 +379,7 @@ mp_grow_internal
 mp_spread_internal
 mp_start
 mp_start_noalign
+mp_append_utf8_32
 mp_open
 mp_realloc
 mp_realloc_zero
@@ -854,6 +858,15 @@ xml_ns_reset
 xml_ns_push_element
 xml_ns_pop_element
 # ucw-xml/xml.h
+xml_node_qname
+xml_attr_qname
+xml_attr_find
+xml_attr_find_ns
+xml_attr_value
+xml_attr_value_ns
+xml_normalize_white
+xml_merge_chars
+xml_merge_dom_chars
 xml_init
 xml_cleanup
 xml_reset
@@ -863,20 +876,29 @@ xml_next
 xml_next_state
 xml_skip_element
 xml_row
-xml_node_qname
-xml_attr_qname
-xml_attr_find
-xml_attr_find_ns
-xml_attr_value
-xml_attr_value_ns
 xml_def_find_entity
 xml_def_resolve_entity
-xml_normalize_white
-xml_merge_chars
-xml_merge_dom_chars
 xml_warn
 xml_error
 xml_fatal
 xml_ns_enable
 xml_ns_by_id
 xml_ns_by_name
+# ucw-json/json.h
+json_new
+json_delete
+json_reset
+json_new_node
+json_new_array
+json_array_append
+json_new_object
+json_object_set
+json_object_get
+json_set_input
+json_peek_token
+json_next_token
+json_next_value
+json_parse
+json_set_output
+json_write_value
+json_write
diff --git a/ucw-json/json.h b/ucw-json/json.h
index 656ea5b1..aa1d9f8a 100644
--- a/ucw-json/json.h
+++ b/ucw-json/json.h
@@ -16,7 +16,23 @@
 #include <ucw/fastbuf.h>
 
 #ifdef CONFIG_UCW_CLEAN_ABI
-// FIXME
+#define json_array_append ucw_json_array_append
+#define json_delete ucw_json_delete
+#define json_new ucw_json_new
+#define json_new_array ucw_json_new_array
+#define json_new_node ucw_json_new_node
+#define json_new_object ucw_json_new_object
+#define json_next_token ucw_json_next_token
+#define json_next_value ucw_json_next_value
+#define json_object_get ucw_json_object_get
+#define json_object_set ucw_json_object_set
+#define json_parse ucw_json_parse
+#define json_peek_token ucw_json_peek_token
+#define json_reset ucw_json_reset
+#define json_set_input ucw_json_set_input
+#define json_set_output ucw_json_set_output
+#define json_write ucw_json_write
+#define json_write_value ucw_json_write_value
 #endif
 
 /***
diff --git a/ucw/fw-hex.h b/ucw/fw-hex.h
index 666f9b2c..c54d0985 100644
--- a/ucw/fw-hex.h
+++ b/ucw/fw-hex.h
@@ -13,7 +13,8 @@
 #include <ucw/fastbuf.h>
 
 #ifdef CONFIG_UCW_CLEAN_ABI
-// FIXME
+#define fb_wrap_hex_in ucw_fb_wrap_hex_in
+#define fb_wrap_hex_out ucw_fb_wrap_hex_out
 #endif
 
 /***
diff --git a/ucw/mempool.h b/ucw/mempool.h
index c0147ad5..63e5a73e 100644
--- a/ucw/mempool.h
+++ b/ucw/mempool.h
@@ -19,6 +19,7 @@
 #define mp_alloc_internal ucw_mp_alloc_internal
 #define mp_alloc_noalign ucw_mp_alloc_noalign
 #define mp_alloc_zero ucw_mp_alloc_zero
+#define mp_append_utf8_32 ucw_mp_append_utf8_32
 #define mp_delete ucw_mp_delete
 #define mp_flush ucw_mp_flush
 #define mp_grow_internal ucw_mp_grow_internal
-- 
2.39.2