StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Some more style changes

Browse Source
This commit is contained in:
Anony Moose 2013-08-24 20:54:03 +00:00
parent 39101b00a2
commit ae3ab2efa4
No known key found for this signature in database
GPG Key ID: A567AC285089C602
1 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
testing/misc_tools.h
View File

@ -34,36 +34,36 @@ unsigned char *hex_string_to_bin(char hex_string[]);
* wiki.tox.im/index.php/Internal_functions_and_data_structures#Debugging * wiki.tox.im/index.php/Internal_functions_and_data_structures#Debugging
*********************************************************/ *********************************************************/
#ifdef DEBUG #ifdef DEBUG
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#define DEBUG_PRINT(str, ...) do { \ #define DEBUG_PRINT(str, ...) do { \
char msg[1000]; \ char msg[1000]; \
sprintf(msg, "%s(): line %d (file %s): %s%%c\n", __FUNCTION__, __LINE__, __FILE__, str); \ sprintf(msg, "%s(): line %d (file %s): %s%%c\n", __FUNCTION__, __LINE__, __FILE__, str); \
fprintf(stderr, msg, __VA_ARGS__); \ fprintf(stderr, msg, __VA_ARGS__); \
} while (0) } while (0)
#define WARNING(...) do { \ #define WARNING(...) do { \
fprintf(stderr, "warning in "); \ fprintf(stderr, "warning in "); \
DEBUG_PRINT(__VA_ARGS__, ' '); \ DEBUG_PRINT(__VA_ARGS__, ' '); \
} while (0) } while (0)
#define INFO(...) do { \ #define INFO(...) do { \
DEBUG_PRINT(__VA_ARGS__, ' '); \ DEBUG_PRINT(__VA_ARGS__, ' '); \
} while (0) } while (0)
#undef ERROR #undef ERROR
#define ERROR(exit_status, ...) do { \ #define ERROR(exit_status, ...) do { \
fprintf(stderr, "error in "); \ fprintf(stderr, "error in "); \
DEBUG_PRINT(__VA_ARGS__, ' '); \ DEBUG_PRINT(__VA_ARGS__, ' '); \
exit(exit_status); \ exit(exit_status); \
} while (0) } while (0)
#else #else
#define WARNING(...) #define WARNING(...)
#define INFO(...) #define INFO(...)
#undef ERROR #undef ERROR
#define ERROR(...) #define ERROR(...)
#endif // DEBUG #endif // DEBUG
/************************Linked List*********************** /************************Linked List***********************
@ -104,8 +104,7 @@ static inline void tox_list_add(tox_list *lst, tox_list *new_lst)
new_lst->prev = lst; new_lst->prev = lst;
} }
static inline void static inline void tox_list_remove(tox_list *lst)
tox_list_remove(tox_list *lst)
{ {
lst->prev->next = lst->next; lst->prev->next = lst->next;
lst->next->prev = lst->prev; lst->next->prev = lst->prev;
@ -123,23 +122,20 @@ typedef struct tox_array {
size_t elem_size; /* in bytes */ size_t elem_size; /* in bytes */
} tox_array; } tox_array;
static inline void static inline void tox_array_init(tox_array *arr, size_t elem_size)
tox_array_init(tox_array *arr, size_t elem_size)
{ {
arr->len = 0; arr->len = 0;
arr->elem_size = elem_size; arr->elem_size = elem_size;
arr->data = NULL; arr->data = NULL;
} }
static inline void static inline void tox_array_delete(tox_array *arr)
tox_array_delete(tox_array *arr)
{ {
free(arr->data); free(arr->data);
arr->len = arr->elem_size = 0; arr->len = arr->elem_size = 0;
} }
static inline void static inline void _tox_array_push(tox_array *arr, uint8_t *item)
_tox_array_push(tox_array *arr, uint8_t *item)
{ {
arr->data = realloc(arr->data, arr->elem_size * (arr->len+1)); arr->data = realloc(arr->data, arr->elem_size * (arr->len+1));
@ -151,8 +147,7 @@ _tox_array_push(tox_array *arr, uint8_t *item)
/* Deletes num items from array. /* Deletes num items from array.
* Not same as pop in stacks, because to access elements you use data. * Not same as pop in stacks, because to access elements you use data.
*/ */
static inline void static inline void tox_array_pop(tox_array *arr, uint32_t num)
tox_array_pop(tox_array *arr, uint32_t num)
{ {
arr->len--; arr->len--;
arr->data = realloc(arr->data, arr->elem_size*arr->len); arr->data = realloc(arr->data, arr->elem_size*arr->len);