devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add error returns to stanza functions.

Browse Source
This commit is contained in:
Jack Moffitt
2005-07-29 19:24:59 +00:00
parent d0e64fdac7
commit 74d8b50d60
3 changed files with 83 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.h
View File

@@ -230,8 +230,8 @@ struct _xmpp_stanza_t {
hash_t *attributes; hash_t *attributes;
}; };
void xmpp_stanza_set_attributes(xmpp_stanza_t * const stanza, int xmpp_stanza_set_attributes(xmpp_stanza_t * const stanza,
const char * const * const attr); const char * const * const attr);
/* parser functions */ /* parser functions */
void parser_handle_start(void *userdata, void parser_handle_start(void *userdata,

98
src/stanza.c
View File

@@ -175,20 +175,20 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
written = 0; written = 0;
if (stanza->type == XMPP_STANZA_UNKNOWN) return -1; if (stanza->type == XMPP_STANZA_UNKNOWN) return XMPP_EINVOP;
if (stanza->type == XMPP_STANZA_TEXT) { if (stanza->type == XMPP_STANZA_TEXT) {
if (!stanza->data) return -2; if (!stanza->data) return XMPP_EINVOP;
ret = snprintf(ptr, left, "%s", stanza->data); ret = snprintf(ptr, left, "%s", stanza->data);
if (ret < 0) return -4; if (ret < 0) return XMPP_EMEM;
_render_update(&written, buflen, ret, &left, &ptr); _render_update(&written, buflen, ret, &left, &ptr);
} else { /* stanza->type == XMPP_STANZA_TAG */ } else { /* stanza->type == XMPP_STANZA_TAG */
if (!stanza->data) return -2; if (!stanza->data) return XMPP_EINVOP;
/* write begining of tag and attributes */ /* write begining of tag and attributes */
ret = snprintf(ptr, left, "<%s", stanza->data); ret = snprintf(ptr, left, "<%s", stanza->data);
if (ret < 0) return -4; if (ret < 0) return XMPP_EMEM;
_render_update(&written, buflen, ret, &left, &ptr); _render_update(&written, buflen, ret, &left, &ptr);
if (stanza->attributes && hash_num_keys(stanza->attributes) > 0) { if (stanza->attributes && hash_num_keys(stanza->attributes) > 0) {
@@ -196,7 +196,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
while ((key = hash_iter_next(iter))) { while ((key = hash_iter_next(iter))) {
ret = snprintf(ptr, left, " %s=\"%s\"", key, ret = snprintf(ptr, left, " %s=\"%s\"", key,
(char *)hash_get(stanza->attributes, key)); (char *)hash_get(stanza->attributes, key));
if (ret < 0) return -4; if (ret < 0) return XMPP_EMEM;
_render_update(&written, buflen, ret, &left, &ptr); _render_update(&written, buflen, ret, &left, &ptr);
} }
hash_iter_release(iter); hash_iter_release(iter);
@@ -205,14 +205,14 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
if (!stanza->children) { if (!stanza->children) {
/* write end if singleton tag */ /* write end if singleton tag */
ret = snprintf(ptr, left, "/>"); ret = snprintf(ptr, left, "/>");
if (ret < 0) return -4; if (ret < 0) return XMPP_EMEM;
_render_update(&written, buflen, ret, &left, &ptr); _render_update(&written, buflen, ret, &left, &ptr);
} else { } else {
/* this stanza has child stanzas */ /* this stanza has child stanzas */
/* write end of start tag */ /* write end of start tag */
ret = snprintf(ptr, left, ">"); ret = snprintf(ptr, left, ">");
if (ret < 0) return -4; if (ret < 0) return XMPP_EMEM;
_render_update(&written, buflen, ret, &left, &ptr); _render_update(&written, buflen, ret, &left, &ptr);
/* iterate and recurse over child stanzas */ /* iterate and recurse over child stanzas */
@@ -228,7 +228,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
/* write end tag */ /* write end tag */
ret = snprintf(ptr, left, "</%s>", stanza->data); ret = snprintf(ptr, left, "</%s>", stanza->data);
if (ret < 0) return -4; if (ret < 0) return XMPP_EMEM;
_render_update(&written, buflen, ret, &left, &ptr); _render_update(&written, buflen, ret, &left, &ptr);
} }
@@ -258,7 +258,7 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
if (!buffer) { if (!buffer) {
*buf = NULL; *buf = NULL;
*buflen = 0; *buflen = 0;
return -5; return XMPP_EMEM;
} }
ret = _render_stanza_recursive(stanza, buffer, length); ret = _render_stanza_recursive(stanza, buffer, length);
@@ -270,14 +270,14 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
xmpp_free(stanza->ctx, buffer); xmpp_free(stanza->ctx, buffer);
*buf = NULL; *buf = NULL;
*buflen = 0; *buflen = 0;
return -5; return XMPP_EMEM;
} }
length = ret; length = ret;
buffer = tmp; buffer = tmp;
buffer[length-1] = 0; buffer[length-1] = 0;
ret = _render_stanza_recursive(stanza, buffer, length); ret = _render_stanza_recursive(stanza, buffer, length);
if (ret > length) return -6; if (ret > length) return XMPP_EMEM;
} }
length = ret + 1; length = ret + 1;
@@ -286,18 +286,20 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
*buf = buffer; *buf = buffer;
*buflen = length - 1; *buflen = length - 1;
return 0; return XMPP_EOK;
} }
void xmpp_stanza_set_name(xmpp_stanza_t *stanza, int xmpp_stanza_set_name(xmpp_stanza_t *stanza,
const char * const name) const char * const name)
{ {
if (stanza->type == XMPP_STANZA_TEXT) return; if (stanza->type == XMPP_STANZA_TEXT) return XMPP_EINVOP;
if (stanza->data) xmpp_free(stanza->ctx, stanza->data); if (stanza->data) xmpp_free(stanza->ctx, stanza->data);
stanza->type = XMPP_STANZA_TAG; stanza->type = XMPP_STANZA_TAG;
stanza->data = xmpp_strdup(stanza->ctx, name); stanza->data = xmpp_strdup(stanza->ctx, name);
return XMPP_EOK;
} }
char *xmpp_stanza_get_name(xmpp_stanza_t * const stanza) char *xmpp_stanza_get_name(xmpp_stanza_t * const stanza)
@@ -308,8 +310,8 @@ char *xmpp_stanza_get_name(xmpp_stanza_t * const stanza)
/* convinience function to copy attributes from the xml parser /* convinience function to copy attributes from the xml parser
* callback into a stanza. this replaces all previous attributes */ * callback into a stanza. this replaces all previous attributes */
void xmpp_stanza_set_attributes(xmpp_stanza_t * const stanza, int xmpp_stanza_set_attributes(xmpp_stanza_t * const stanza,
const char * const * const attr) const char * const * const attr)
{ {
int i; int i;
char *value; char *value;
@@ -318,7 +320,7 @@ void xmpp_stanza_set_attributes(xmpp_stanza_t * const stanza,
hash_release(stanza->attributes); hash_release(stanza->attributes);
stanza->attributes = hash_new(stanza->ctx, 8, xmpp_free); stanza->attributes = hash_new(stanza->ctx, 8, xmpp_free);
if (!stanza->attributes) return; if (!stanza->attributes) return XMPP_EMEM;
for (i = 0; attr[i]; i += 2) { for (i = 0; attr[i]; i += 2) {
value = xmpp_strdup(stanza->ctx, attr[i + 1]); value = xmpp_strdup(stanza->ctx, attr[i + 1]);
@@ -328,34 +330,38 @@ void xmpp_stanza_set_attributes(xmpp_stanza_t * const stanza,
} }
hash_add(stanza->attributes, attr[i], value); hash_add(stanza->attributes, attr[i], value);
} }
return XMPP_EOK;
} }
void xmpp_stanza_set_attribute(xmpp_stanza_t * const stanza, int xmpp_stanza_set_attribute(xmpp_stanza_t * const stanza,
const char * const key, const char * const key,
const char * const value) const char * const value)
{ {
char *val; char *val;
if (stanza->type != XMPP_STANZA_TAG) return; if (stanza->type != XMPP_STANZA_TAG) return XMPP_EINVOP;
if (!stanza->attributes) { if (!stanza->attributes) {
stanza->attributes = hash_new(stanza->ctx, 8, xmpp_free); stanza->attributes = hash_new(stanza->ctx, 8, xmpp_free);
if (!stanza->attributes) return; if (!stanza->attributes) return XMPP_EMEM;
} }
val = xmpp_strdup(stanza->ctx, value); val = xmpp_strdup(stanza->ctx, value);
if (!val) return; if (!val) return XMPP_EMEM;
hash_add(stanza->attributes, key, val); hash_add(stanza->attributes, key, val);
return XMPP_EOK;
} }
void xmpp_stanza_set_ns(xmpp_stanza_t * const stanza, int xmpp_stanza_set_ns(xmpp_stanza_t * const stanza,
const char * const ns) const char * const ns)
{ {
xmpp_stanza_set_attribute(stanza, "xmlns", ns); return xmpp_stanza_set_attribute(stanza, "xmlns", ns);
} }
void xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child) int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child)
{ {
xmpp_stanza_t *s; xmpp_stanza_t *s;
@@ -372,33 +378,39 @@ void xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child)
s->next = child; s->next = child;
child->prev = s; child->prev = s;
} }
return XMPP_EOK;
} }
void xmpp_stanza_set_text(xmpp_stanza_t *stanza, int xmpp_stanza_set_text(xmpp_stanza_t *stanza,
const char * const text) const char * const text)
{ {
if (stanza->type == XMPP_STANZA_TAG) return; if (stanza->type == XMPP_STANZA_TAG) return XMPP_EINVOP;
stanza->type = XMPP_STANZA_TEXT; stanza->type = XMPP_STANZA_TEXT;
if (stanza->data) xmpp_free(stanza->ctx, stanza->data); if (stanza->data) xmpp_free(stanza->ctx, stanza->data);
stanza->data = xmpp_strdup(stanza->ctx, text); stanza->data = xmpp_strdup(stanza->ctx, text);
return XMPP_EOK;
} }
void xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza, int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
const char * const text, const char * const text,
const size_t size) const size_t size)
{ {
if (stanza->type == XMPP_STANZA_TAG) return; if (stanza->type == XMPP_STANZA_TAG) return XMPP_EINVOP;
stanza->type = XMPP_STANZA_TEXT; stanza->type = XMPP_STANZA_TEXT;
if (stanza->data) xmpp_free(stanza->ctx, stanza->data); if (stanza->data) xmpp_free(stanza->ctx, stanza->data);
stanza->data = xmpp_alloc(stanza->ctx, size + 1); stanza->data = xmpp_alloc(stanza->ctx, size + 1);
if (!stanza->data) return; if (!stanza->data) return XMPP_EMEM;
memcpy(stanza->data, text, size); memcpy(stanza->data, text, size);
stanza->data[size] = 0; stanza->data[size] = 0;
return XMPP_EOK;
} }
char *xmpp_stanza_get_id(xmpp_stanza_t * const stanza) char *xmpp_stanza_get_id(xmpp_stanza_t * const stanza)
@@ -485,16 +497,16 @@ char *xmpp_stanza_get_text(xmpp_stanza_t * const stanza)
return text; return text;
} }
void xmpp_stanza_set_id(xmpp_stanza_t * const stanza, int xmpp_stanza_set_id(xmpp_stanza_t * const stanza,
const char * const id) const char * const id)
{ {
xmpp_stanza_set_attribute(stanza, "id", id); return xmpp_stanza_set_attribute(stanza, "id", id);
} }
void xmpp_stanza_set_type(xmpp_stanza_t * const stanza, int xmpp_stanza_set_type(xmpp_stanza_t * const stanza,
const char * const type) const char * const type)
{ {
xmpp_stanza_set_attribute(stanza, "type", type); return xmpp_stanza_set_attribute(stanza, "type", type);
} }
char *xmpp_stanza_get_attribute(xmpp_stanza_t * const stanza, char *xmpp_stanza_get_attribute(xmpp_stanza_t * const stanza,

46
strophe.h
View File

@@ -26,6 +26,12 @@ extern "C" {
#define XMPP_NS_DISCO_ITEMS "http://jabber.org/protocol/disco#items" #define XMPP_NS_DISCO_ITEMS "http://jabber.org/protocol/disco#items"
#define XMPP_NS_ROSTER "jabber:iq:roster" #define XMPP_NS_ROSTER "jabber:iq:roster"
/* error defines */
#define XMPP_EOK 0
#define XMPP_EMEM -1
#define XMPP_EINVOP -2
#define XMPP_EINT -3
/** initialization and shutdown **/ /** initialization and shutdown **/
void xmpp_initialize(void); void xmpp_initialize(void);
@@ -228,31 +234,31 @@ char * xmpp_stanza_get_ns(xmpp_stanza_t * const stanza);
char *xmpp_stanza_get_text(xmpp_stanza_t * const stanza); char *xmpp_stanza_get_text(xmpp_stanza_t * const stanza);
char *xmpp_stanza_get_name(xmpp_stanza_t * const stanza); char *xmpp_stanza_get_name(xmpp_stanza_t * const stanza);
void xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child); int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child);
void xmpp_stanza_set_ns(xmpp_stanza_t * const stanza, const char * const ns); int xmpp_stanza_set_ns(xmpp_stanza_t * const stanza, const char * const ns);
/* set_attribute adds/replaces attributes */ /* set_attribute adds/replaces attributes */
void xmpp_stanza_set_attribute(xmpp_stanza_t * const stanza, int xmpp_stanza_set_attribute(xmpp_stanza_t * const stanza,
const char * const key, const char * const key,
const char * const value); const char * const value);
void xmpp_stanza_set_name(xmpp_stanza_t *stanza, int xmpp_stanza_set_name(xmpp_stanza_t *stanza,
const char * const name); const char * const name);
void xmpp_stanza_set_text(xmpp_stanza_t *stanza, int xmpp_stanza_set_text(xmpp_stanza_t *stanza,
const char * const text); const char * const text);
void xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza, int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
const char * const text, const char * const text,
const size_t size); const size_t size);
/* common stanza helpers */ /* common stanza helpers */
char *xmpp_stanza_get_type(xmpp_stanza_t * const stanza); char *xmpp_stanza_get_type(xmpp_stanza_t * const stanza);
char *xmpp_stanza_get_id(xmpp_stanza_t * const stanza); char *xmpp_stanza_get_id(xmpp_stanza_t * const stanza);
void xmpp_stanza_get_to(); int xmpp_stanza_get_to();
void xmpp_stanza_get_from(); int xmpp_stanza_get_from();
void xmpp_stanza_set_id(xmpp_stanza_t * const stanza, int xmpp_stanza_set_id(xmpp_stanza_t * const stanza,
const char * const id); const char * const id);
void xmpp_stanza_set_type(xmpp_stanza_t * const stanza, int xmpp_stanza_set_type(xmpp_stanza_t * const stanza,
const char * const type); const char * const type);
void xmpp_stanza_set_to(); int xmpp_stanza_set_to();
void xmpp_stanza_set_from(); int xmpp_stanza_set_from();
/** allocate and initialize a stanza in reply to another */ /** allocate and initialize a stanza in reply to another */
xmpp_stanza_t *xmpp_stanza_reply(const xmpp_stanza_t *stanza); xmpp_stanza_t *xmpp_stanza_reply(const xmpp_stanza_t *stanza);