projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid to store configuration in psensor struct
[psensor.git]
/
src
/
lib
/
psensor.c
diff --git
a/src/lib/psensor.c
b/src/lib/psensor.c
index
e75c589
..
c8dc6a9
100644
(file)
--- a/
src/lib/psensor.c
+++ b/
src/lib/psensor.c
@@
-23,6
+23,8
@@
#include <libintl.h>
#define _(str) gettext(str)
#include <libintl.h>
#define _(str) gettext(str)
+#include <stdio.h>
+
#include <hdd.h>
#include <psensor.h>
#include <temperature.h>
#include <hdd.h>
#include <psensor.h>
#include <temperature.h>
@@
-61,7
+63,6
@@
struct psensor *psensor_create(char *id,
psensor->color = NULL;
psensor->graph_enabled = 1;
psensor->color = NULL;
psensor->graph_enabled = 1;
- psensor->appindicator_enabled = 0;
psensor->provider_data = NULL;
psensor->provider_data_free_fct = &free;
psensor->provider_data = NULL;
psensor->provider_data_free_fct = &free;
@@
-155,32
+156,15
@@
int psensor_list_size(struct psensor **sensors)
return size;
}
return size;
}
-int psensor_list_contains_type(struct psensor **sensors, unsigned int type)
-{
- struct psensor **s;
-
- if (!sensors)
- return 0;
-
- s = sensors;
- while (*s) {
- if ((*s)->type & type)
- return 1;
- s++;
- }
-
- return 0;
-}
-
struct psensor **psensor_list_add(struct psensor **sensors,
struct psensor *sensor)
{
int size;
struct psensor **psensor_list_add(struct psensor **sensors,
struct psensor *sensor)
{
int size;
+ struct psensor **result;
size = psensor_list_size(sensors);
size = psensor_list_size(sensors);
- struct psensor **result
- = malloc((size + 1 + 1) * sizeof(struct psensor *));
+ result = malloc((size + 1 + 1) * sizeof(struct psensor *));
if (sensors)
memcpy(result, sensors, size * sizeof(struct psensor *));
if (sensors)
memcpy(result, sensors, size * sizeof(struct psensor *));