Attachment #397386 for bug #541232

View | Details | Raw Unified | Return to bug 541232
Collapse All | Expand All




#define CLEANUP xf86freeFiles

XF86ConfFilesPtr
xf86parseFilesSection(XF86ConfFilesPtr ptr)
{
    int i, j;
    int k, l;
    char *str;
    int token;

    if (!ptr) {
	if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) {
		return NULL;
	}
    }

        while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
        switch (token) {

Lines 37-43 void xf86freeDeviceList(XF86ConfDevicePtr ptr); Link Here

(-)a/hw/xfree86/parser/configProcs.h (-1 / +1 lines)
37	int xf86validateDevice(XF86ConfigPtr p);	37	int xf86validateDevice(XF86ConfigPtr p);
38		38
39	/* Files.c */	39	/* Files.c */
40	XF86ConfFilesPtr xf86parseFilesSection(void);	40	XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr);
41	void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr);	41	void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr);
42	void xf86freeFiles(XF86ConfFilesPtr p);	42	void xf86freeFiles(XF86ConfFilesPtr p);
43		43

Lines 110-116 xf86readConfigFile(void) Link Here

(-)a/hw/xfree86/parser/read.c (-2 / +1 lines)
110	if (xf86nameCompare(xf86_lex_val.str, "files") == 0) {	110	if (xf86nameCompare(xf86_lex_val.str, "files") == 0) {
111	free(xf86_lex_val.str);	111	free(xf86_lex_val.str);
112	xf86_lex_val.str = NULL;	112	xf86_lex_val.str = NULL;
113	HANDLE_RETURN(conf_files, xf86parseFilesSection());	113	HANDLE_RETURN(conf_files, xf86parseFilesSection(ptr->conf_files));
114	}	114	}
115	else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) {	115	else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) {
116	free(xf86_lex_val.str);	116	free(xf86_lex_val.str);
117	-

Return to bug 541232

Lines 76-89 static xf86ConfigSymTabRec FilesTab[] = { Link Here

(-)a/hw/xfree86/parser/Files.c (-2 / +6 lines)
76	#define CLEANUP xf86freeFiles	76	#define CLEANUP xf86freeFiles
77		77
78	XF86ConfFilesPtr	78	XF86ConfFilesPtr
79	xf86parseFilesSection(void)	79	xf86parseFilesSection(XF86ConfFilesPtr ptr)
80	{	80	{
81	int i, j;	81	int i, j;
82	int k, l;	82	int k, l;
83	char *str;	83	char *str;
84	int token;	84	int token;
85		85
86	parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec)	86	if (!ptr) {
		87	if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) {
		88	return NULL;
		89	}
		90	}
87		91
88	while ((token = xf86getToken(FilesTab)) != ENDSECTION) {	92	while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
89	switch (token) {	93	switch (token) {