From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Sat, 16 Jul 2011 10:02:30 +0000 (+0000)
Subject: removed close_display fct and moved code directly in nvidia_cleanup
X-Git-Tag: v0.8.0.5~714
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=483d35af0bfd40ad10f7fdfbb958011beed4c9df

removed close_display fct and moved code directly in nvidia_cleanup
---

diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index a1ba14d..10d0c65 100644
--- a/src/lib/nvidia.c
+++ b/src/lib/nvidia.c
@@ -75,13 +75,6 @@ static struct psensor *create_sensor(int id, int values_len)
 	return s;
 }
 
-static void close_display()
-{
-	XCloseDisplay(display);
-	display = NULL;
-
-}
-
 /*
   Opens connection to X server and returns the number
   of NVidia GPUs.
@@ -149,6 +142,8 @@ nvidia_psensor_list_add(struct psensor **sensors, int values_len)
 
 void nvidia_cleanup()
 {
-	if (display)
-		close_display();
+	if (display) {
+		XCloseDisplay(display);
+		display = NULL;
+	}
 }