From 9fcfb654af032d8ba23c08d9472b7390d9b204f2 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 14 Jul 2008 16:21:48 +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. 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
---
 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 d640ac30..3e6bef9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ lm-sensors CHANGES file
 -----------------------
 
 SVN-HEAD
+  libsensors: Avoid namespace pollution
   fancontrol: Don't use named pipes when we don't need them (#2319)
   sensors-detect: Add Intel SCH (bus) support
                   Add SMSC EMC6D103 support
diff --git a/lib/conf-parse.y b/lib/conf-parse.y
index fbf12c9e..47fea254 100644
--- a/lib/conf-parse.y
+++ b/lib/conf-parse.y
@@ -158,7 +158,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;
@@ -173,8 +173,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 d1ec201c..7c8b55d8 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -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)
diff --git a/lib/init.h b/lib/init.h
index 2876d474..a86983ad 100644
--- a/lib/init.h
+++ b/lib/init.h
@@ -23,6 +23,6 @@
 
 #include "data.h"
 
-void free_expr(sensors_expr *expr);
+void sensors_free_expr(sensors_expr *expr);
 
 #endif /* def LIB_SENSORS_INIT_H */