dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d0ceccd
)
Keep old encoding if new one cannot be created.
author
Peter Verthez
<Peter.Verthez@advalvas.be>
Sun, 22 Sep 2002 09:22:13 +0000
(09:22 +0000)
committer
Peter Verthez
<Peter.Verthez@advalvas.be>
Sun, 22 Sep 2002 09:22:13 +0000
(09:22 +0000)
gedcom/encoding.c
patch
|
blob
|
history
diff --git
a/gedcom/encoding.c
b/gedcom/encoding.c
index b5e2b40b148d99ae0a7e8cfca253bd5f6fb30d15..36f88f3bca4a0b81ad9db73d31218a3cbe6b81b9 100644
(file)
--- a/
gedcom/encoding.c
+++ b/
gedcom/encoding.c
@@
-237,22
+237,26
@@
static size_t conv_buf_size;
int open_conv_to_internal(const char* fromcode)
{
int open_conv_to_internal(const char* fromcode)
{
+ iconv_t new_cd_to_internal;
const char *encoding = get_encoding(fromcode, the_enc);
const char *encoding = get_encoding(fromcode, the_enc);
- if (cd_to_internal != (iconv_t) -1)
- iconv_close(cd_to_internal);
if (encoding == NULL) {
if (encoding == NULL) {
- cd_to_internal = (iconv_t) -1;
+
new_
cd_to_internal = (iconv_t) -1;
}
else {
memset(conv_buf, 0, sizeof(conv_buf));
conv_buf_size = 0;
}
else {
memset(conv_buf, 0, sizeof(conv_buf));
conv_buf_size = 0;
- cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
- if (cd_to_internal == (iconv_t) -1) {
+
new_
cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
+ if (
new_
cd_to_internal == (iconv_t) -1) {
gedcom_error(_("Error opening conversion context for encoding %s: %s"),
encoding, strerror(errno));
}
}
gedcom_error(_("Error opening conversion context for encoding %s: %s"),
encoding, strerror(errno));
}
}
- return (cd_to_internal != (iconv_t) -1);
+ if (new_cd_to_internal != (iconv_t) -1) {
+ if (cd_to_internal != (iconv_t) -1)
+ iconv_close(cd_to_internal);
+ cd_to_internal = new_cd_to_internal;
+ }
+ return (new_cd_to_internal != (iconv_t) -1);
}
void close_conv_to_internal()
}
void close_conv_to_internal()