From: Peter Verthez <Peter.Verthez@advalvas.be>
Date: Tue, 17 Sep 2002 15:50:18 +0000 (+0000)
Subject: Fixes for const correctness.
X-Git-Url: https://git.dlugolecki.net.pl/?a=commitdiff_plain;h=c27f416da8583f06adb78c6c23e11b43a6949f3c;p=gedcom-parse.git

Fixes for const correctness.
---

diff --git a/gedcom/compat.c b/gedcom/compat.c
index c566d8e..3b72548 100644
--- a/gedcom/compat.c
+++ b/gedcom/compat.c
@@ -168,15 +168,24 @@ int compat_generate_char(Gedcom_ctxt parent)
 {
   struct tag_struct ts;
   Gedcom_ctxt self1;
+  char* charset;
   
   /* first generate "1 CHAR <DEFAULT_CHAR>" */
   ts.string = "CHAR";
   ts.value  = TAG_CHAR;
-  self1 = start_element(ELT_HEAD_CHAR, parent, 1, ts, (char*)default_charset,
-			GEDCOM_MAKE_STRING(val1, (char*)default_charset));
-  
-  /* close "1 CHAR" */
-  end_element(ELT_HEAD_CHAR, parent, self1, NULL);
+
+  /* Must strdup, because default_charset is const char */
+  charset   = strdup(default_charset);
+  if (! charset)
+    MEMORY_ERROR;
+  else {
+    self1 = start_element(ELT_HEAD_CHAR, parent, 1, ts, charset,
+			  GEDCOM_MAKE_STRING(val1, charset));
+    free(charset);
+    
+    /* close "1 CHAR" */
+    end_element(ELT_HEAD_CHAR, parent, self1, NULL);
+  }
   if (open_conv_to_internal(default_charset) == 0)
     return 1;
   else