mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-18 19:30:54 +00:00
The free_expr() function is no longer static in lib/init.c (it is also
used in lib/conf-parse.y), and therefore must be renamed according to the libsensors naming conventions. Based on an original patch from Sergey Vlasov. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5302 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
a03f51bbcb
commit
9fcfb654af
4 files changed
+11
-10
No files matched your search
+6
-6
@@ -129,15 +129,15 @@ static void free_label(sensors_label *label)
|
||||
free(label->value);
|
||||
}
|
||||
|
||||
void free_expr(sensors_expr *expr)
|
||||
void sensors_free_expr(sensors_expr *expr)
|
||||
{
|
||||
if (expr->kind == sensors_kind_var)
|
||||
free(expr->data.var);
|
||||
else if (expr->kind == sensors_kind_sub) {
|
||||
if (expr->data.subexpr.sub1)
|
||||
free_expr(expr->data.subexpr.sub1);
|
||||
sensors_free_expr(expr->data.subexpr.sub1);
|
||||
if (expr->data.subexpr.sub2)
|
||||
free_expr(expr->data.subexpr.sub2);
|
||||
sensors_free_expr(expr->data.subexpr.sub2);
|
||||
}
|
||||
free(expr);
|
||||
}
|
||||
@@ -145,14 +145,14 @@ void free_expr(sensors_expr *expr)
|
||||
static void free_set(sensors_set *set)
|
||||
{
|
||||
free(set->name);
|
||||
free_expr(set->value);
|
||||
sensors_free_expr(set->value);
|
||||
}
|
||||
|
||||
static void free_compute(sensors_compute *compute)
|
||||
{
|
||||
free(compute->name);
|
||||
free_expr(compute->from_proc);
|
||||
free_expr(compute->to_proc);
|
||||
sensors_free_expr(compute->from_proc);
|
||||
sensors_free_expr(compute->to_proc);
|
||||
}
|
||||
|
||||
static void free_ignore(sensors_ignore *ignore)
|
||||
|
||||
Reference in new issue
Block a user