From c81c36ff81cfd8970ad2357d0448be420e99053c Mon Sep 17 00:00:00 2001
From: Alexandr Shadchin <shadchin@cvs.openbsd.org>
Date: Mon, 7 Nov 2011 18:42:33 +0000
Subject: Replace xf86FindOptionValue on xf86SetStrOption. If option set as "",
 then xf86FindOptionValue returns "", and xf86SetStrOption returns NULL.

ok matthieu@
---
 driver/xf86-input-ws/src/ws.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c
index 2221d2bc7..d29a7180d 100644
--- a/driver/xf86-input-ws/src/ws.c
+++ b/driver/xf86-input-ws/src/ws.c
@@ -13,7 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $OpenBSD: ws.c,v 1.37 2011/11/07 18:36:53 shadchin Exp $ */
+/* $OpenBSD: ws.c,v 1.38 2011/11/07 18:42:32 shadchin Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -139,7 +139,7 @@ wsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
 	    ws_debug_level);
 	xf86IDrvMsg(pInfo, X_INFO, "debuglevel %d\n", ws_debug_level);
 #endif
-	priv->devName = xf86FindOptionValue(pInfo->options, "Device");
+	priv->devName = xf86SetStrOption(pInfo->options, "Device", NULL);
 	if (priv->devName == NULL) {
 		xf86IDrvMsg(pInfo, X_ERROR, "No Device specified.\n");
 		rc = BadValue;
@@ -219,7 +219,7 @@ wsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
 	}
 	priv->inv_x = 0;
 	priv->inv_y = 0;
-	s = xf86FindOptionValue(pInfo->options, "Rotate");
+	s = xf86SetStrOption(pInfo->options, "Rotate", NULL);
 	if (s) {
 		if (xf86NameCmp(s, "CW") == 0) {
 			priv->inv_x = 1;
-- 
cgit v1.2.3