Extra argument for setting encoding.

diff --git a/include/gedcom.h.in b/include/gedcom.h.in
index 7625ef4075f68515e687f384b85c7bb25a8ff00b..83b89fce635d8c6bfe2ca82bd91f84bb4eeaaa41 100644 (file)
--- a/include/gedcom.h.in
+++ b/include/gedcom.h.in
@@ -385,6 +385,14 @@ typedef enum _ENC_LINE_END {
   END_LF_CR = 3
 } Enc_line_end;
 
+typedef enum _ENC_FROM {
+  ENC_FROM_FILE = 0,
+  ENC_FROM_SYS  = 1,
+  ENC_MANUAL    = 2
+} Enc_from;
+
+struct encoding_state;
+
 typedef enum _DATE_INPUT {
   DI_FROM_STRINGS,
   DI_FROM_NUMBERS,
@@ -540,9 +548,10 @@ int                gedcom_delete_xref(const char* xrefstr);
 /* Writing support */
 Gedcom_write_hndl  gedcom_write_open(const char* filename);
 int  gedcom_write_close(Gedcom_write_hndl hndl, int *total_conv_fails);
-int  gedcom_write_set_encoding(const char* charset, Encoding width,
+int  gedcom_write_set_encoding(Enc_from from,
+                              const char* charset, Encoding width,
                                Enc_bom bom);
-int  gedcom_write_set_line_terminator(Enc_line_end end);
+int  gedcom_write_set_line_terminator(Enc_from from, Enc_line_end end);
 
 int  gedcom_write_record_str(Gedcom_write_hndl hndl,
                             Gedcom_rec rec, char* xrefstr, char* val);

diff --git a/t/src/gom_write.c b/t/src/gom_write.c
index fd73319678910f35f21b18fb6baf43e5c5fe0b0e..c0c9199553d953c21e3312564be5bad3a99a4c01 100644 (file)
--- a/t/src/gom_write.c
+++ b/t/src/gom_write.c
@@ -235,8 +235,8 @@ int main(int argc, char* argv[])
   gedcom_init();
   setlocale(LC_ALL, "");
   gedcom_set_message_handler(gedcom_message_handler);
-  gedcom_write_set_encoding(encoding, enc, bom);
-  gedcom_write_set_line_terminator(end);
+  gedcom_write_set_encoding(ENC_MANUAL, encoding, enc, bom);
+  gedcom_write_set_line_terminator(ENC_MANUAL, end);
 
   output_open(outfilename);