valentineus/0xFFFF
1
Fork 0
Code Releases Activity

device: Fix device_list_alloc_to_bufs

Browse Source
This commit is contained in:
Pali Rohár committed 2012-09-22 19:37:21 +02:00
1 parent 54ddeb6407
commit e41cf5236a
2 files changed
+67 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/device.c
+63 -25
View File
@@ -148,37 +148,64 @@ char * hwrevs_alloc_to_string(const int16_t * hwrevs) {
} }
char ** device_hwrevs_alloc_to_256bufs(const struct device_hwrevs * device_hwrevs) { char ** device_list_alloc_to_bufs(const struct device_list * device_list) {
int16_t * hwrevs = device_hwrevs->hwrevs;
const char * device;
int count = 0; int count = 0;
int size = 0;
const char * device;
const struct device_list * device_first;
char ** ret; char ** ret;
char * last_ptr;
int i, j, k; int i, j, k;
device = device_to_string(device_hwrevs->device); device_first = device_list;
if ( ! device )
return NULL;
for ( i = 0; hwrevs[i] != -1; ++i ) while ( device_first ) {
if ( hwrevs[i] >= 0 && hwrevs[i] <= 9999 )
int local = 0;
if ( ! device_to_string(device_first->device) )
continue;
for ( i = 0; device_first->hwrevs[i] != -1; ++i )
if ( device_first->hwrevs[i] >= 0 && device_first->hwrevs[i] <= 9999 )
++local;
size += 1+16+local*8;
count += local/30;
if ( local%30 != 0 || local == 0 )
++count; ++count;
count = count/30 + 2; device_first = device_first->next;
ret = malloc(count*sizeof(char *) + count*256); }
ret = calloc(1, count*sizeof(char *) + size);
if ( ! ret ) if ( ! ret )
return NULL; return NULL;
i = -1;
j = 0; j = 0;
last_ptr = (char *)ret + count*sizeof(char *);
device_first = device_list;
while ( hwrevs[i+1] != -1 ) { while ( device_first ) {
ret[j] = (char *)ret + count*sizeof(char *) + j*256; i = -1;
memset(ret[j], 0, 256); device = device_to_string(device_first->device);
strncpy(ret[j], device, 16); if ( ! device ) {
device_first = device_first->next;
continue;
}
while ( device_first->hwrevs[i+1] != -1 ) {
uint8_t len = 0;
ret[j] = last_ptr;
strncpy(ret[j]+1, device, 16);
last_ptr += 16;
len += 16;
k = 0; k = 0;
@@ -186,25 +213,32 @@ char ** device_hwrevs_alloc_to_256bufs(const struct device_hwrevs * device_hwrev
++i; ++i;
if ( hwrevs[i] < 0 || hwrevs[i] > 9999 ) if ( device_first->hwrevs[i] < 0 || device_first->hwrevs[i] > 9999 )
continue; continue;
memset(ret[j] + k*8, 0, 8); snprintf(ret[j]+1+k*8, 8, "%d", device_first->hwrevs[i]);
snprintf(ret[j] + k*8, 8, "%d", hwrevs[i]); last_ptr += 8;
len += 8;
} }
ret[j][0] = len;
++j; ++j;
} }
device_first = device_first->next;
}
ret[j] = NULL; ret[j] = NULL;
return ret; return ret;
} }
struct device_hwrevs device_hwrevs_alloc_from_256buf(const char * buf, size_t size) { struct device_list * device_list_alloc_from_buf(const char * buf, size_t size) {
int i; int i;
int len; int len;
@@ -212,7 +246,11 @@ struct device_hwrevs device_hwrevs_alloc_from_256buf(const char * buf, size_t si
char str[17]; char str[17];
const char * ptr1; const char * ptr1;
const char * ptr; const char * ptr;
struct device_hwrevs ret; struct device_list * ret;
ret = calloc(1, sizeof(struct device_list));
if ( ! ret )
return NULL;
len = strnlen(buf, size); len = strnlen(buf, size);
if ( len > 16 ) if ( len > 16 )
@@ -222,7 +260,7 @@ struct device_hwrevs device_hwrevs_alloc_from_256buf(const char * buf, size_t si
memcpy(str, buf, len); memcpy(str, buf, len);
ptr1 = buf + len; ptr1 = buf + len;
ret.device = device_from_string(str); ret->device = device_from_string(str);
ptr = ptr1; ptr = ptr1;
count = 1; count = 1;
@@ -243,8 +281,8 @@ struct device_hwrevs device_hwrevs_alloc_from_256buf(const char * buf, size_t si
} }
ret.hwrevs = calloc(count, sizeof(int16_t)); ret->hwrevs = calloc(count, sizeof(int16_t));
if ( ! ret.hwrevs ) if ( ! ret->hwrevs )
return ret; return ret;
ptr = ptr1; ptr = ptr1;
@@ -264,11 +302,11 @@ struct device_hwrevs device_hwrevs_alloc_from_256buf(const char * buf, size_t si
memset(str, 0, sizeof(str)); memset(str, 0, sizeof(str));
memcpy(str, ptr, len); memcpy(str, ptr, len);
ptr += len + 1; ptr += len + 1;
ret.hwrevs[i++] = atoi(str); ret->hwrevs[i++] = atoi(str);
} }
ret.hwrevs[i] = -1; ret->hwrevs[i] = -1;
return ret; return ret;
} }
src/device.h
+4 -3
View File
@@ -36,9 +36,10 @@ enum device {
- terminated by -1 - terminated by -1
- valid numbers: 0-9999 - valid numbers: 0-9999
*/ */
struct device_hwrevs { struct device_list {
enum device device; enum device device;
int16_t * hwrevs; int16_t * hwrevs;
struct device_list * next;
}; };
enum device device_from_string(const char * device); enum device device_from_string(const char * device);
@@ -50,7 +51,7 @@ int hwrevs_is_valid(const int16_t * hwrevs, int16_t hwrev);
int16_t * hwrevs_alloc_from_string(const char * str); int16_t * hwrevs_alloc_from_string(const char * str);
char * hwrevs_alloc_to_string(const int16_t * hwrevs); char * hwrevs_alloc_to_string(const int16_t * hwrevs);
char ** device_hwrevs_alloc_to_256bufs(const struct device_hwrevs * device_hwrevs); char ** device_list_alloc_to_bufs(const struct device_list * device_list);
struct device_hwrevs device_hwrevs_alloc_from_256buf(const char * buf, size_t size); struct device_list * device_list_alloc_from_buf(const char * buf, size_t size);
#endif #endif