d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OFW: Fix ofw_bus_string_list_to_array() function.

Browse Source 
Originally committed version was unfinished and didn't work at all,
because I took it from the wrong WIP branch by mistake.

Approved by:	kib (mentor)
This commit is contained in:
mmel 2016-01-20 14:49:01 +00:00
parent 213b199382
commit 6e7de4e62d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ofw/ofw_bus_subr.c
View File

@ -716,9 +716,10 @@ ofw_bus_find_string_index(phandle_t node, const char *list_name,
*/
int
ofw_bus_string_list_to_array(phandle_t node, const char *list_name,
const char ***array)
const char ***out_array)
{
char *elems, *tptr;
const char **array;
int i, cnt, nelems, len;
elems = NULL;
@ -731,11 +732,11 @@ ofw_bus_string_list_to_array(phandle_t node, const char *list_name,
i += strlen(elems + i) + 1;
/* Allocate space for arrays and all strings. */
*array = malloc((cnt + 1) * sizeof(char *) + nelems, M_OFWPROP,
array = malloc((cnt + 1) * sizeof(char *) + nelems, M_OFWPROP,
M_WAITOK);
/* Get address of first string. */
tptr = (char *)(*array + cnt);
tptr = (char *)(array + cnt + 1);
/* Copy strings. */
memcpy(tptr, elems, nelems);
@ -743,12 +744,13 @@ ofw_bus_string_list_to_array(phandle_t node, const char *list_name,
/* Fill string pointers. */
for (i = 0, cnt = 0; i < nelems; cnt++) {
len = strlen(tptr + i) + 1;
*array[cnt] = tptr;
len = strlen(tptr) + 1;
array[cnt] = tptr;
i += len;
tptr += len;
}
*array[cnt] = 0;
array[cnt] = 0;
*out_array = array;
return (cnt);
}