From 389555eda390f4480e973f9eb894e0f54b14610f Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 14 Jul 2008 16:15:07 +0000 Subject: [PATCH] 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. Patch from Sergey Vlasov. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5301 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + lib/conf-parse.y | 6 +++--- lib/init.c | 12 ++++++------ lib/init.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index bac655b8..ff416c1f 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ lm_sensors CHANGES file ----------------------- SVN-HEAD + Library: Avoid namespace pollution 2.10.7 (20080701) diff --git a/lib/conf-parse.y b/lib/conf-parse.y index 9e75606b..84eaee2e 100644 --- a/lib/conf-parse.y +++ b/lib/conf-parse.y @@ -170,7 +170,7 @@ set_statement: SET function_name expression if (!current_chip) { sensors_yyerror("Set statement before first chip statement"); free($2); - free_expr($3); + sensors_free_expr($3); YYERROR; } new_el.lineno = $1; @@ -185,8 +185,8 @@ compute_statement: COMPUTE function_name expression ',' expression if (!current_chip) { sensors_yyerror("Compute statement before first chip statement"); free($2); - free_expr($3); - free_expr($5); + sensors_free_expr($3); + sensors_free_expr($5); YYERROR; } new_el.lineno = $1; diff --git a/lib/init.c b/lib/init.c index 2e7f696c..158f0b1a 100644 --- a/lib/init.c +++ b/lib/init.c @@ -171,14 +171,14 @@ void free_label(sensors_label label) void free_set(sensors_set set) { free(set.name); - free_expr(set.value); + sensors_free_expr(set.value); } 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); } void free_ignore(sensors_ignore ignore) @@ -186,15 +186,15 @@ void free_ignore(sensors_ignore ignore) free(ignore.name); } -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); } diff --git a/lib/init.h b/lib/init.h index c413e392..ae0476a7 100644 --- a/lib/init.h +++ b/lib/init.h @@ -22,6 +22,6 @@ #include "data.h" -void free_expr(sensors_expr *expr); +void sensors_free_expr(sensors_expr *expr); #endif /* def LIB_SENSORS_INIT_H */