buildroot

From 268ec01e448ed7cedf90b37fbc27f01806637825 Mon Sep 17 00:00:00 2001

From: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Date: Mon, 30 Oct 2017 22:10:23 +0100

Subject: [PATCH 1/1] Fix static library linking with gupnp

​

gupnp and gupnp-av defines two internal functions with the same name:

xml_util_get_element and xml_util_get_child_element_content, as a result

an application such as rygel can't be build statically.

To fix this issue, rename both functions as

xml_util_get_element2 and xml_util_get_child_element_content2

​

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

---

 libgupnp-av/gupnp-cds-last-change-parser.c |  2 +-

 libgupnp-av/gupnp-didl-lite-container.c    |  4 ++--

 libgupnp-av/gupnp-didl-lite-item.c         |  2 +-

 libgupnp-av/gupnp-didl-lite-object.c       | 26 +++++++++++++-------------

 libgupnp-av/gupnp-didl-lite-parser.c       |  4 ++--

 libgupnp-av/gupnp-didl-lite-writer.c       |  2 +-

 libgupnp-av/gupnp-feature-list-parser.c    |  2 +-

 libgupnp-av/gupnp-last-change-parser.c     |  2 +-

 libgupnp-av/xml-util.c                     | 16 ++++++++--------

 libgupnp-av/xml-util.h                     |  4 ++--

 10 files changed, 32 insertions(+), 32 deletions(-)

​

diff --git a/libgupnp-av/gupnp-cds-last-change-parser.c b/libgupnp-av/gupnp-cds-last-change-parser.c

index cff5f0b..36f6b0a 100644

--- a/libgupnp-av/gupnp-cds-last-change-parser.c

+++ b/libgupnp-av/gupnp-cds-last-change-parser.c

@@ -119,7 +119,7 @@ gupnp_cds_last_change_parser_parse (GUPnPCDSLastChangeParser *parser,

                 goto out;

         }

-        state_event = xml_util_get_element ((xmlNode *) doc,

+        state_event = xml_util_get_element2 ((xmlNode *) doc,

                                             "StateEvent",

                                             NULL);

         if (state_event == NULL) {

diff --git a/libgupnp-av/gupnp-didl-lite-container.c b/libgupnp-av/gupnp-didl-lite-container.c

index d7ac578..c0e7395 100644

--- a/libgupnp-av/gupnp-didl-lite-container.c

+++ b/libgupnp-av/gupnp-didl-lite-container.c

@@ -340,7 +340,7 @@ gupnp_didl_lite_container_container_update_id_is_set

         xml_node = gupnp_didl_lite_object_get_xml_node

                                         (GUPNP_DIDL_LITE_OBJECT (container));

-        content = xml_util_get_child_element_content (xml_node,

+        content = xml_util_get_child_element_content2 (xml_node,

                                                       "containerUpdateID");

         return content != NULL;

 }

@@ -390,7 +390,7 @@ gupnp_didl_lite_container_total_deleted_child_count_is_set

         xml_node = gupnp_didl_lite_object_get_xml_node

                                         (GUPNP_DIDL_LITE_OBJECT (container));

-        content = xml_util_get_child_element_content (xml_node,

+        content = xml_util_get_child_element_content2 (xml_node,

                                                       "totalDeletedChildCount");

         return content != NULL;

 }

diff --git a/libgupnp-av/gupnp-didl-lite-item.c b/libgupnp-av/gupnp-didl-lite-item.c

index 3588052..3d6d4d0 100644

--- a/libgupnp-av/gupnp-didl-lite-item.c