aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/parser/Pointer.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-06 18:48:27 +0000
committermarha <marha@users.sourceforge.net>2009-09-06 18:48:27 +0000
commita915739887477b28d924ecc8417ee107d125bd6c (patch)
treec02f315476b61892d1fd89182e18943dce8d6277 /xorg-server/hw/xfree86/parser/Pointer.c
parent6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff)
downloadvcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.gz
vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.bz2
vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.zip
Switched to xorg-server-1.6.99.900.tar.gz
Diffstat (limited to 'xorg-server/hw/xfree86/parser/Pointer.c')
-rw-r--r--xorg-server/hw/xfree86/parser/Pointer.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/xorg-server/hw/xfree86/parser/Pointer.c b/xorg-server/hw/xfree86/parser/Pointer.c
index eeb0834bf..56a26ba74 100644
--- a/xorg-server/hw/xfree86/parser/Pointer.c
+++ b/xorg-server/hw/xfree86/parser/Pointer.c
@@ -115,19 +115,19 @@ xf86parsePointerSection (void)
if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
Error (QUOTE_MSG, "Protocol");
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("Protocol"),
+ strdup("Protocol"),
val.str);
break;
case PDEVICE:
if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
Error (QUOTE_MSG, "Device");
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("Device"),
+ strdup("Device"),
val.str);
break;
case EMULATE3:
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("Emulate3Buttons"),
+ strdup("Emulate3Buttons"),
NULL);
break;
case EM3TIMEOUT:
@@ -135,12 +135,12 @@ xf86parsePointerSection (void)
Error (POSITIVE_INT_MSG, "Emulate3Timeout");
s = xf86uLongToString(val.num);
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("Emulate3Timeout"),
+ strdup("Emulate3Timeout"),
s);
break;
case CHORDMIDDLE:
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("ChordMiddle"),
+ strdup("ChordMiddle"),
NULL);
break;
case PBUTTONS:
@@ -148,36 +148,36 @@ xf86parsePointerSection (void)
Error (POSITIVE_INT_MSG, "Buttons");
s = xf86uLongToString(val.num);
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("Buttons"), s);
+ strdup("Buttons"), s);
break;
case BAUDRATE:
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
Error (POSITIVE_INT_MSG, "BaudRate");
s = xf86uLongToString(val.num);
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("BaudRate"), s);
+ strdup("BaudRate"), s);
break;
case SAMPLERATE:
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
Error (POSITIVE_INT_MSG, "SampleRate");
s = xf86uLongToString(val.num);
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("SampleRate"), s);
+ strdup("SampleRate"), s);
break;
case PRESOLUTION:
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
Error (POSITIVE_INT_MSG, "Resolution");
s = xf86uLongToString(val.num);
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("Resolution"), s);
+ strdup("Resolution"), s);
break;
case CLEARDTR:
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("ClearDTR"), NULL);
+ strdup("ClearDTR"), NULL);
break;
case CLEARRTS:
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("ClearRTS"), NULL);
+ strdup("ClearRTS"), NULL);
break;
case ZAXISMAPPING:
switch (xf86getToken(ZMapTab)) {
@@ -186,28 +186,28 @@ xf86parsePointerSection (void)
Error (ZAXISMAPPING_MSG, NULL);
s1 = xf86uLongToString(val.num);
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {
- xf86conffree(s1);
+ free(s1);
Error (ZAXISMAPPING_MSG, NULL);
}
s2 = xf86uLongToString(val.num);
l = strlen(s1) + 1 + strlen(s2) + 1;
- s = xf86confmalloc(l);
+ s = malloc(l);
sprintf(s, "%s %s", s1, s2);
- xf86conffree(s1);
- xf86conffree(s2);
+ free(s1);
+ free(s2);
break;
case XAXIS:
- s = xf86configStrdup("x");
+ s = strdup("x");
break;
case YAXIS:
- s = xf86configStrdup("y");
+ s = strdup("y");
break;
default:
Error (ZAXISMAPPING_MSG, NULL);
break;
}
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("ZAxisMapping"),
+ strdup("ZAxisMapping"),
s);
break;
case ALWAYSCORE:
@@ -221,10 +221,10 @@ xf86parsePointerSection (void)
}
}
- ptr->inp_identifier = xf86configStrdup(CONF_IMPLICIT_POINTER);
- ptr->inp_driver = xf86configStrdup("mouse");
+ ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);
+ ptr->inp_driver = strdup("mouse");
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
- xf86configStrdup("CorePointer"), NULL);
+ strdup("CorePointer"), NULL);
#ifdef DEBUG
printf ("Pointer section parsed\n");