Mass reindent, coding style and whitespace cleanups.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4736 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-08-31 14:42:20 +00:00
1 parent 02dc2e6679
commit a82c6b0476
14 files changed
+249 -243

No files matched your search

+43 -40
View File
@@ -29,62 +29,65 @@
void sensors_malloc_array(void *list, int *num_el, int *max_el, int el_size)
{
void **my_list = (void **)list;
void **my_list = (void **)list;
*my_list = malloc(el_size*A_BUNCH);
if (! *my_list)
sensors_fatal_error("sensors_malloc_array","Allocating new elements");
*max_el = A_BUNCH;
*num_el = 0;
*my_list = malloc(el_size*A_BUNCH);
if (! *my_list)
sensors_fatal_error("sensors_malloc_array",
"Allocating new elements");
*max_el = A_BUNCH;
*num_el = 0;
}
void sensors_free_array(void *list, int *num_el, int *max_el)
{
void **my_list = (void **)list;
void **my_list = (void **)list;
free(*my_list);
*my_list = NULL;
*num_el = 0;
*max_el = 0;
free(*my_list);
*my_list = NULL;
*num_el = 0;
*max_el = 0;
}
void sensors_add_array_el(const void *el, void *list, int *num_el,
int *max_el, int el_size)
int *max_el, int el_size)
{
int new_max_el;
void **my_list = (void *)list;
if (*num_el + 1 > *max_el) {
new_max_el = *max_el + A_BUNCH;
*my_list = realloc(*my_list,new_max_el * el_size);
if (! *my_list)
sensors_fatal_error("sensors_add_array_el","Allocating new elements");
*max_el = new_max_el;
}
memcpy(((char *) *my_list) + *num_el * el_size, el, el_size);
(*num_el) ++;
int new_max_el;
void **my_list = (void *)list;
if (*num_el + 1 > *max_el) {
new_max_el = *max_el + A_BUNCH;
*my_list = realloc(*my_list, new_max_el * el_size);
if (! *my_list)
sensors_fatal_error("sensors_add_array_el",
"Allocating new elements");
*max_el = new_max_el;
}
memcpy(((char *) *my_list) + *num_el * el_size, el, el_size);
(*num_el) ++;
}
void sensors_add_array_els(const void *els, int nr_els, void *list,
int *num_el, int *max_el, int el_size)
void sensors_add_array_els(const void *els, int nr_els, void *list,
int *num_el, int *max_el, int el_size)
{
int new_max_el;
void **my_list = (void *)list;
if (*num_el + nr_els > *max_el) {
new_max_el = (*max_el + nr_els + A_BUNCH);
new_max_el -= new_max_el % A_BUNCH;
*my_list = realloc(*my_list,new_max_el * el_size);
if (! *my_list)
sensors_fatal_error("sensors_add_array_els","Allocating new elements");
*max_el = new_max_el;
}
memcpy(((char *)*my_list) + *num_el * el_size, els, el_size * nr_els);
*num_el += nr_els;
int new_max_el;
void **my_list = (void *)list;
if (*num_el + nr_els > *max_el) {
new_max_el = (*max_el + nr_els + A_BUNCH);
new_max_el -= new_max_el % A_BUNCH;
*my_list = realloc(*my_list, new_max_el * el_size);
if (! *my_list)
sensors_fatal_error("sensors_add_array_els",
"Allocating new elements");
*max_el = new_max_el;
}
memcpy(((char *)*my_list) + *num_el * el_size, els, el_size * nr_els);
*num_el += nr_els;
}
/* Strip a string of all terminating spaces */
void sensors_strip_of_spaces(char *name)
{
int i;
for (i = strlen(name)-1; (i>=0) && (name[i] == ' '); i--);
name[i+1] = '\0';
int i;
for (i = strlen(name) - 1; i >= 0 && name[i] == ' '; i--);
name[i + 1] = '\0';
}