mirror of
https://github.com/lm-sensors/lm-sensors
synced 2025-09-06 01:05:32 +00:00
71a96916d5
> Current gcc versions warn when type punning is used, as this breaks the > strict aliasing analysis gcc 3.3 does by default. When checking the causes > for these warnings I discovered that sensors_malloc_array, > sensors_free_array, sensors_add_array_el and sensors_add_array_els in > lib/general.c all take a 'void **' for the list. This is plain wrong as > the C standard only allow 'char *' and 'void *' to alias any other type, so > if these functions should take a generic pointer, it *must* be a 'void *' > that's internally cast to a 'void **'. > > The attached patch does this and adapts all places where these functions are > called. Note that when done correctly, no cast what-so-ever in the calling > code is needed. > > The patch is against current lm_sensors2 cvs version. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2345 7894878c-1315-0410-8ee3-d5d059ff63e0
91 lines
2.7 KiB
C
91 lines
2.7 KiB
C
/*
|
|
general.c - Part of libsensors, a Linux library for reading sensor data.
|
|
Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include "error.h"
|
|
#include "general.h"
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
|
|
#define A_BUNCH 16
|
|
|
|
void sensors_malloc_array(void *list, int *num_el, int *max_el, int el_size)
|
|
{
|
|
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;
|
|
}
|
|
|
|
void sensors_free_array(void *list, int *num_el, int *max_el)
|
|
{
|
|
void **my_list = (void **)list;
|
|
|
|
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 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)
|
|
{
|
|
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';
|
|
}
|