From 971aef64416058665bc903fee39fea1619cd3727 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri, 31 Oct 2008 17:05:40 +1030
Subject: [PATCH] dix: FreeDeviceClass() and friends can be static.

---
 dix/devices.c   | 48 +++++++++++++++++++++++++-----------------------
 include/input.h |  3 ---
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 1e7588e59..2ec928415 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -659,31 +659,10 @@ InitAndStartDevices()
     return Success;
 }
 
-_X_EXPORT void
-FreeAllDeviceClasses(ClassesPtr classes)
-{
-    if (!classes)
-        return;
-
-    FreeDeviceClass(KeyClass, (pointer)&classes->key);
-    FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
-    FreeDeviceClass(ButtonClass, (pointer)&classes->button);
-    FreeDeviceClass(FocusClass, (pointer)&classes->focus);
-    FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
-
-    FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
-    FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
-    FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
-    FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
-    FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
-    FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
-
-}
-
 /**
  * Free the given device class and reset the pointer to NULL.
  */
-_X_EXPORT void
+static void
 FreeDeviceClass(int type, pointer *class)
 {
     if (!(*class))
@@ -742,7 +721,8 @@ FreeDeviceClass(int type, pointer *class)
     }
     *class = NULL;
 }
-_X_EXPORT void
+
+static void
 FreeFeedbackClass(int type, pointer *class)
 {
     if (!(*class))
@@ -828,6 +808,28 @@ FreeFeedbackClass(int type, pointer *class)
     }
     *class = NULL;
 }
+
+static void
+FreeAllDeviceClasses(ClassesPtr classes)
+{
+    if (!classes)
+        return;
+
+    FreeDeviceClass(KeyClass, (pointer)&classes->key);
+    FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
+    FreeDeviceClass(ButtonClass, (pointer)&classes->button);
+    FreeDeviceClass(FocusClass, (pointer)&classes->focus);
+    FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
+
+    FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
+    FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
+    FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
+    FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
+    FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
+    FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
+
+}
+
 /**
  * Close down a device and free all resources.
  * Once closed down, the driver will probably not expect you that you'll ever
diff --git a/include/input.h b/include/input.h
index 408d9dafd..bf63f4bd0 100644
--- a/include/input.h
+++ b/include/input.h
@@ -523,9 +523,6 @@ extern int AllocMasterDevice(ClientPtr client,
 extern void DeepCopyDeviceClasses(DeviceIntPtr from,
                                   DeviceIntPtr to);
 
-extern void FreeDeviceClass(int type, pointer* class);
-extern void FreeFeedbackClass(int type, pointer* class);
-extern void FreeAllDeviceClasses(ClassesPtr classes);
 extern int EnterLeaveSemaphoresIsset(WindowPtr win);
 extern int FocusSemaphoresIsset(WindowPtr win);