gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-15 13:35:53 +01:00
Code Issues Projects Releases Wiki Activity

Remove dependency to CPP: create structure to keep info of file being parsed

Browse Source 
All the information related to the file being parsed are stored in
a single place. The content of this structure is not visible to
caller to avoid messing the content; the parsing will be handled as
methods to this object.

Please note that all functions visible as part of the parser's API
are using the CamelCaseNotation to be consistent with the rest of
the API; however all internal functions use the non_camel_case_syntax
to follow the coding style set by Carlos for the project.
This commit is contained in:
Christophe CURIS
2012-07-08 14:20:24 +02:00
committed by Carlos R. Mafra
parent f0e8b76c03
commit 19f0998cd1
5 changed files with 108 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
WINGs/menuparser.c
View File

@@ -25,10 +25,44 @@
#include <WINGs/WUtil.h>
#define MAXLINE 1024
#include "menuparser.h"
static WMenuParser menu_parser_create_new(const char *file_name, void *file);
char *getLine(void * file, const char *file_name)
/***** Constructor and Destructor for the Menu Parser object *****/
WMenuParser WMenuParserCreate(const char *file_name, void *file)
{
WMenuParser parser;
parser = menu_parser_create_new(file_name, file);
return parser;
}
void WMenuParserDelete(WMenuParser parser)
{
wfree(parser);
}
static WMenuParser menu_parser_create_new(const char *file_name, void *file)
{
WMenuParser parser;
parser = wmalloc(sizeof(*parser));
parser->file_name = file_name;
parser->file_handle = file;
parser->rd = parser->line_buffer;
return parser;
}
/***** To report helpfull messages to user *****/
const char *WMenuParserGetFilename(WMenuParser parser)
{
return parser->file_name;
}
char *getLine(WMenuParser parser)
{
char linebuf[MAXLINE];
char *line = NULL, *result = NULL;
@@ -37,7 +71,7 @@ char *getLine(void * file, const char *file_name)
again:
done = 0;
while (!done && fgets(linebuf, sizeof(linebuf), file) != NULL) {
while (!done && fgets(linebuf, sizeof(linebuf), parser->file_handle) != NULL) {
line = wtrimspace(linebuf);
len = strlen(line);
@@ -57,7 +91,7 @@ again:
wfree(line);
}
}
if (!done || ferror(file)) {
if (!done || ferror(parser->file_handle)) {
wfree(result);
result = NULL;
} else if (result != NULL && (result[0] == 0 || result[0] == '#' ||
@@ -67,7 +101,7 @@ again:
goto again;
} else if (result != NULL && strlen(result) >= MAXLINE) {
wwarning(_("%s:maximal line size exceeded in menu config: %s"),
file_name, line);
parser->file_name, line);
wfree(result);
result = NULL;
goto again;