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
Some updates...
[gedcom-parse.git]
/
gedcom
/
multilex.c
diff --git
a/gedcom/multilex.c
b/gedcom/multilex.c
index 9a57b628d2dc3cdf75a2f6a960c78465f66f4e25..e8d514cb67296e2777548eeb0ebf80c1ed733ade 100644
(file)
--- a/
gedcom/multilex.c
+++ b/
gedcom/multilex.c
@@
-33,7
+33,7
@@
lex_func lf;
#define NEW_MODEL_FILE "new.ged"
#define NEW_MODEL_FILE "new.ged"
-int lexer_init(E
NCODING
enc, FILE* f)
+int lexer_init(E
ncoding
enc, FILE* f)
{
if (enc == ONE_BYTE) {
lf = &gedcom_1byte_lex;
{
if (enc == ONE_BYTE) {
lf = &gedcom_1byte_lex;
@@
-122,6
+122,7
@@
int gedcom_init()
{
init_called = 1;
update_gconv_search_path();
{
init_called = 1;
update_gconv_search_path();
+ init_encodings();
if (!setlocale(LC_ALL, "")
|| ! bindtextdomain(PACKAGE, LOCALEDIR)
|| ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING))
if (!setlocale(LC_ALL, "")
|| ! bindtextdomain(PACKAGE, LOCALEDIR)
|| ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING))
@@
-132,7
+133,7
@@
int gedcom_init()
int gedcom_parse_file(const char* file_name)
{
int gedcom_parse_file(const char* file_name)
{
- E
NCODING
enc;
+ E
ncoding
enc;
int result = 1;
FILE* file;
int result = 1;
FILE* file;
@@
-146,7
+147,7
@@
int gedcom_parse_file(const char* file_name)
file_name, strerror(errno));
}
else {
file_name, strerror(errno));
}
else {
-
init_encodings()
;
+
line_no = 1
;
enc = determine_encoding(file);
if (lexer_init(enc, file)) {
enc = determine_encoding(file);
if (lexer_init(enc, file)) {