aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/parser/Files.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
committermarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
commit81f91c615982e50bb62708201569c33a3cd3d973 (patch)
tree4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/hw/xfree86/parser/Files.c
parentb571a562410f565af2bdde52d9f7f9a23ffae04f (diff)
parenta915739887477b28d924ecc8417ee107d125bd6c (diff)
downloadvcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/parser/Files.c')
-rw-r--r--xorg-server/hw/xfree86/parser/Files.c59
1 files changed, 8 insertions, 51 deletions
diff --git a/xorg-server/hw/xfree86/parser/Files.c b/xorg-server/hw/xfree86/parser/Files.c
index c3523024d..0c718354e 100644
--- a/xorg-server/hw/xfree86/parser/Files.c
+++ b/xorg-server/hw/xfree86/parser/Files.c
@@ -70,11 +70,11 @@ static xf86ConfigSymTabRec FilesTab[] =
{ENDSECTION, "endsection"},
{FONTPATH, "fontpath"},
{MODULEPATH, "modulepath"},
- {INPUTDEVICES, "inputdevices"},
{LOGFILEPATH, "logfile"},
{XKBDIR, "xkbdir"},
/* Obsolete keywords that aren't used but shouldn't cause errors: */
{OBSOLETE_TOKEN, "rgbpath"},
+ {OBSOLETE_TOKEN, "inputdevices"},
{-1, ""},
};
@@ -103,7 +103,7 @@ xf86parseFilesSection (void)
str = val.str;
if (ptr->file_fontpath == NULL)
{
- ptr->file_fontpath = xf86confmalloc (1);
+ ptr->file_fontpath = malloc (1);
ptr->file_fontpath[0] = '\0';
i = strlen (str) + 1;
}
@@ -117,12 +117,12 @@ xf86parseFilesSection (void)
}
}
ptr->file_fontpath =
- xf86confrealloc (ptr->file_fontpath, i);
+ realloc (ptr->file_fontpath, i);
if (j)
strcat (ptr->file_fontpath, ",");
strcat (ptr->file_fontpath, str);
- xf86conffree (val.str);
+ free (val.str);
break;
case MODULEPATH:
if (xf86getSubToken (&(ptr->file_comment)) != STRING)
@@ -131,7 +131,7 @@ xf86parseFilesSection (void)
str = val.str;
if (ptr->file_modulepath == NULL)
{
- ptr->file_modulepath = xf86confmalloc (1);
+ ptr->file_modulepath = malloc (1);
ptr->file_modulepath[0] = '\0';
k = strlen (str) + 1;
}
@@ -144,39 +144,12 @@ xf86parseFilesSection (void)
l = TRUE;
}
}
- ptr->file_modulepath = xf86confrealloc (ptr->file_modulepath, k);
+ ptr->file_modulepath = realloc (ptr->file_modulepath, k);
if (l)
strcat (ptr->file_modulepath, ",");
strcat (ptr->file_modulepath, str);
- xf86conffree (val.str);
- break;
- case INPUTDEVICES:
- if (xf86getSubToken (&(ptr->file_comment)) != STRING)
- Error (QUOTE_MSG, "InputDevices");
- l = FALSE;
- str = val.str;
- if (ptr->file_inputdevs == NULL)
- {
- ptr->file_inputdevs = xf86confmalloc (1);
- ptr->file_inputdevs[0] = '\0';
- k = strlen (str) + 1;
- }
- else
- {
- k = strlen (ptr->file_inputdevs) + strlen (str) + 1;
- if (ptr->file_inputdevs[strlen (ptr->file_inputdevs) - 1] != ',')
- {
- k++;
- l = TRUE;
- }
- }
- ptr->file_inputdevs = xf86confrealloc (ptr->file_inputdevs, k);
- if (l)
- strcat (ptr->file_inputdevs, ",");
-
- strcat (ptr->file_inputdevs, str);
- xf86conffree (val.str);
+ free (val.str);
break;
case LOGFILEPATH:
if (xf86getSubToken (&(ptr->file_comment)) != STRING)
@@ -237,21 +210,6 @@ xf86printFileSection (FILE * cf, XF86ConfFilesPtr ptr)
}
fprintf (cf, "\tModulePath \"%s\"\n", s);
}
- if (ptr->file_inputdevs)
- {
- s = ptr->file_inputdevs;
- p = index (s, ',');
- while (p)
- {
- *p = '\000';
- fprintf (cf, "\tInputDevices \"%s\"\n", s);
- *p = ',';
- s = p;
- s++;
- p = index (s, ',');
- }
- fprintf (cf, "\tInputDevices \"%s\"\n", s);
- }
if (ptr->file_fontpath)
{
s = ptr->file_fontpath;
@@ -279,10 +237,9 @@ xf86freeFiles (XF86ConfFilesPtr p)
TestFree (p->file_logfile);
TestFree (p->file_modulepath);
- TestFree (p->file_inputdevs);
TestFree (p->file_fontpath);
TestFree (p->file_comment);
TestFree (p->file_xkbdir);
- xf86conffree (p);
+ free (p);
}