From 43103e4abd62828c0eb45dbda5d557a2e4bc5352 Mon Sep 17 00:00:00 2001 From: Dan Staples Date: Thu, 15 May 2014 17:04:48 -0400 Subject: [PATCH] change size_t to ssize_t to allow for returning negative error values --- src/list.c | 20 ++++++++++---------- src/list.h | 6 +++--- src/tree.c | 4 ++-- src/tree.h | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/list.c b/src/list.c index 6e2842e..7c755a5 100644 --- a/src/list.c +++ b/src/list.c @@ -183,34 +183,34 @@ _co_list_set_last(co_obj_t *list, _listnode_t *node) return 0; } -static size_t /* Done */ +static ssize_t /* Done */ _co_list_change_length(co_obj_t *list, const int delta) { if(CO_TYPE(list) == _list16) { ((co_list16_t *)list)->_len += delta; - return (size_t)(((co_list16_t *)list)->_len); + return (ssize_t)(((co_list16_t *)list)->_len); } else if(CO_TYPE(list) == _list32) { ((co_list32_t *)list)->_len += delta; - return (size_t)(((co_list32_t *)list)->_len); + return (ssize_t)(((co_list32_t *)list)->_len); } ERROR("Not a list object."); return -1; } -static size_t /* Done */ +static ssize_t /* Done */ _co_list_increment(co_obj_t *list) { return _co_list_change_length(list, 1); } -static size_t /* Done */ +static ssize_t /* Done */ _co_list_decrement(co_obj_t *list) { return _co_list_change_length(list, -1); } -size_t /* Done */ +ssize_t /* Done */ co_list_length(co_obj_t *list) { return _co_list_change_length(list, 0); @@ -499,10 +499,10 @@ co_list_element(co_obj_t *list, const unsigned int index) return NULL; } -size_t +ssize_t co_list_raw(char *output, const size_t olen, const co_obj_t *list) { - size_t written = 0, read = 0; + ssize_t written = 0, read = 0; char *in = NULL; char *out = output; switch(CO_TYPE(list)) @@ -558,10 +558,10 @@ co_list_raw(char *output, const size_t olen, const co_obj_t *list) } -size_t +ssize_t co_list_import(co_obj_t **list, const char *input, const size_t ilen) { - size_t length = 0, olen = 0, read = 0; + ssize_t length = 0, olen = 0, read = 0; co_obj_t *obj = NULL; const char *cursor = input; switch((uint8_t)input[0]) diff --git a/src/list.h b/src/list.h index b60fe2d..25e19be 100644 --- a/src/list.h +++ b/src/list.h @@ -51,7 +51,7 @@ _DECLARE_LIST(32); * @brief return length (number of objects) of given list * @param list list object */ -size_t co_list_length(co_obj_t *list); +ssize_t co_list_length(co_obj_t *list); /** * @brief return first element of given list @@ -162,7 +162,7 @@ co_obj_t *co_list_element(co_obj_t *list, const unsigned int index); * @param olen length of output buffer * @param list list object to process */ -size_t co_list_raw(char *output, const size_t olen, const co_obj_t *list); +ssize_t co_list_raw(char *output, const size_t olen, const co_obj_t *list); /** * @brief import list from raw representation @@ -170,7 +170,7 @@ size_t co_list_raw(char *output, const size_t olen, const co_obj_t *list); * @param input input buffer * @param ilen length of input buffer */ -size_t co_list_import(co_obj_t **list, const char *input, const size_t ilen); +ssize_t co_list_import(co_obj_t **list, const char *input, const size_t ilen); /** * @brief print list with indent diff --git a/src/tree.c b/src/tree.c index 36e5093..63882d9 100644 --- a/src/tree.c +++ b/src/tree.c @@ -619,7 +619,7 @@ _co_tree_raw_r(char **output, const size_t *olen, size_t *written, _treenode_t * return; } -size_t +ssize_t co_tree_raw(char *output, const size_t olen, const co_obj_t *tree) { char *out = output; @@ -655,7 +655,7 @@ co_tree_raw(char *output, const size_t olen, const co_obj_t *tree) } -size_t +ssize_t co_tree_import(co_obj_t **tree, const char *input, const size_t ilen) { size_t length = 0, olen = 0, read = 0, klen = 0; diff --git a/src/tree.h b/src/tree.h index 2ccaa4e..896082f 100644 --- a/src/tree.h +++ b/src/tree.h @@ -200,7 +200,7 @@ void co_tree_destroy(co_obj_t *root); * @param olen length of output buffer * @param tree tree to dump */ -size_t co_tree_raw(char *output, const size_t olen, const co_obj_t *tree); +ssize_t co_tree_raw(char *output, const size_t olen, const co_obj_t *tree); /** * @brief import raw representation of tree @@ -208,7 +208,7 @@ size_t co_tree_raw(char *output, const size_t olen, const co_obj_t *tree); * @param input input buffer * @param ilen length of input buffer */ -size_t co_tree_import(co_obj_t **tree, const char *input, const size_t ilen); +ssize_t co_tree_import(co_obj_t **tree, const char *input, const size_t ilen); /** * @brief print tree with indent