Moved stanza_get_child_by_ns

This commit is contained in:
James Booth
2015-06-06 22:47:55 +01:00
parent df6556fe14
commit 9fc69177da
4 changed files with 34 additions and 34 deletions

View File

@@ -111,6 +111,39 @@ stanza_add_child(XMPPStanza *parent, XMPPStanza *child)
parent->children = g_list_append(parent->children, child);
}
XMPPStanza*
stanza_get_child_by_ns(XMPPStanza *stanza, char *ns)
{
if (!stanza) {
return NULL;
}
if (!stanza->children) {
return NULL;
}
GList *curr_child = stanza->children;
while (curr_child) {
XMPPStanza *child = curr_child->data;
if (!child->attrs) {
return NULL;
}
GList *curr_attr = child->attrs;
while (curr_attr) {
XMPPAttr *attr = curr_attr->data;
if ((g_strcmp0(attr->name, "xmlns") == 0) && (g_strcmp0(attr->value, ns) == 0)) {
return child;
}
curr_attr = g_list_next(curr_attr);
}
curr_child = g_list_next(curr_child);
}
return NULL;
}
static void
start_element(void *data, const char *element, const char **attributes)
{

View File

@@ -42,5 +42,6 @@ XMPPStanza* stanza_new(const char *name, const char **attributes);
XMPPStanza* parse_stanza(char *stanza_text);
char* stanza_to_string(XMPPStanza *stanza);
void stanza_add_child(XMPPStanza *parent, XMPPStanza *child);
XMPPStanza* stanza_get_child_by_ns(XMPPStanza *stanza, char *ns);
#endif

View File

@@ -62,39 +62,6 @@ stanza_add(XMPPStanza *stanza)
pthread_mutex_unlock(&stanzas_lock);
}
XMPPStanza*
stanza_get_child_by_ns(XMPPStanza *stanza, char *ns)
{
if (!stanza) {
return NULL;
}
if (!stanza->children) {
return NULL;
}
GList *curr_child = stanza->children;
while (curr_child) {
XMPPStanza *child = curr_child->data;
if (!child->attrs) {
return NULL;
}
GList *curr_attr = child->attrs;
while (curr_attr) {
XMPPAttr *attr = curr_attr->data;
if ((g_strcmp0(attr->name, "xmlns") == 0) && (g_strcmp0(attr->value, ns) == 0)) {
return child;
}
curr_attr = g_list_next(curr_attr);
}
curr_child = g_list_next(curr_child);
}
return NULL;
}
XMPPStanza*
stanza_get_child_by_name(XMPPStanza *stanza, char *name)
{

View File

@@ -32,7 +32,6 @@ const char* stanza_get_id(XMPPStanza *stanza);
void stanza_set_id(XMPPStanza *stanza, const char *id);
const char *stanza_get_query_request(XMPPStanza *stanza);
XMPPStanza* stanza_get_child_by_ns(XMPPStanza *stanza, char *ns);
XMPPStanza* stanza_get_child_by_name(XMPPStanza *stanza, char *name);
int stanza_verify_any(XMPPStanza *stanza);