Enlightenment CVS committal
Author : davemds
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
engrave.y engrave_load.c engrave_parse.c
Log Message:
* don't make exit(-1) on parse errors. instead return NULL
* preprocess edc files as edje do, more portable. see edje code for more info
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave.y,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- engrave.y 2 Aug 2007 13:44:35 -0000 1.29
+++ engrave.y 21 Aug 2007 05:42:29 -0000 1.30
@@ -1072,7 +1072,6 @@
{
fprintf(stderr, "file: %s, line: %d, column: %d\n\n",
engrave_cur_file, engrave_lnum, engrave_col);
- exit(-1);
}
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_load.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- engrave_load.c 2 Mar 2007 17:04:10 -0000 1.20
+++ engrave_load.c 21 Aug 2007 05:42:29 -0000 1.21
@@ -49,11 +49,11 @@
path = strdup(".");
}
- snprintf(buf, sizeof(buf), "cat %s | cpp -E -I%s -o %s", file, path, tmpf);
+ snprintf(buf, sizeof(buf), "cat %s | cpp -I%s > %s", file, path, tmpf);
ret = system(buf);
if (ret < 0)
{
- snprintf(buf, sizeof(buf), "gcc -E -I %s -o %s %s", path, tmpf, file);
+ snprintf(buf, sizeof(buf), "gcc -E -I%s -o %s %s", path, tmpf, file);
ret = system(buf);
}
FREE(path);
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_parse.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- engrave_parse.c 29 Jul 2007 14:48:30 -0000 1.23
+++ engrave_parse.c 21 Aug 2007 05:42:29 -0000 1.24
@@ -8,15 +8,19 @@
Engrave_File *
engrave_parse(const char *file, const char *imdir, const char *fontdir)
{
+ int ret;
engrave_file = engrave_file_new();
engrave_file_image_dir_set(engrave_file, imdir);
engrave_file_font_dir_set(engrave_file, fontdir);
yyin = fopen(file, "r");
- yyparse();
+ ret = yyparse();
fclose(yyin);
- return (engrave_file);
+ if (ret == 0)
+ return (engrave_file);
+
+ return (NULL);
}
void
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
