dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add compiler flags for warnings.
[gedcom-parse.git]
/
gedcom
/
gedcom_lex_common.c
diff --git
a/gedcom/gedcom_lex_common.c
b/gedcom/gedcom_lex_common.c
index d0d329cab5e031d81a20bcab027e8bed6384ada1..efc4bf931eed796ff332e6dec4df9a36f20d9c28 100644
(file)
--- a/
gedcom/gedcom_lex_common.c
+++ b/
gedcom/gedcom_lex_common.c
@@
-136,10
+136,14
@@
static void error_unexpected_character(const char* str, char ch)
gedcom_error(_("Unexpected character: '%s' (0x%02x)"), str, ch);
}
gedcom_error(_("Unexpected character: '%s' (0x%02x)"), str, ch);
}
+/* This is to bypass the iconv conversion (if the input is UTF-8 coming
+ from the program) */
+static int dummy_conv = 0;
+
#elif LEX_SECTION == 2
#define TO_INTERNAL(STR,OUTBUF) \
#elif LEX_SECTION == 2
#define TO_INTERNAL(STR,OUTBUF) \
-
to_internal(STR, yyleng, OUTBUF, sizeof(OUTBUF
))
+
(dummy_conv ? STR : to_internal(STR, yyleng, OUTBUF, sizeof(OUTBUF)
))
#define INIT_LINE_LEN \
line_len = 0;
#define INIT_LINE_LEN \
line_len = 0;
@@
-398,6
+402,7
@@
void yymyinit(FILE *f)
/* Reset our state */
current_level = -1;
level_diff = MAXGEDCLEVEL;
/* Reset our state */
current_level = -1;
level_diff = MAXGEDCLEVEL;
+ BEGIN(INITIAL);
}
#endif
}
#endif