jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

common: fix apk_array copying, and additional size_t fixes

cute-signatures
Timo Teräs 2012-01-06 10:25:28 +02:00
parent a80cdfe95b
commit bbc31806b9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apk_defines.h
View File

@ -108,6 +108,7 @@ void *apk_array_resize(void *array, size_t new_size, size_t elem_size);
static inline void \
array_type_name##_copy(struct array_type_name **a, struct array_type_name *b)\
{ \
if (*a == b) return; \
*a = apk_array_resize(*a, b->num, sizeof(elem_type_name));\
memcpy((*a)->item, b->item, b->num * sizeof(elem_type_name));\
} \

6
src/common.c
View File

@ -10,13 +10,15 @@
#include <malloc.h>
#include <string.h>
#include <unistd.h>
#include "apk_defines.h"
static int *dummy_array = 0;
void *apk_array_resize(void *array, size_t new_size, size_t elem_size)
{
int old_size, diff;
size_t old_size;
ssize_t diff;
void *tmp;
if (new_size == 0) {
@ -25,7 +27,7 @@ void *apk_array_resize(void *array, size_t new_size, size_t elem_size)
return &dummy_array;
}
old_size = array ? *((int*) array) : 0;
old_size = array ? *((size_t *) array) : 0;
diff = new_size - old_size;
if (array == &dummy_array)