Taking care of const correctness.

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index b10e0c24e7e1b4e87686ac9fb0adbd3acc01efb6..43811029a08739c5864e784fd103ae741cf3856f 100644 (file)
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -162,7 +162,7 @@ char *line_item_buf_ptr;
 
 /* These are defined at the bottom of the file */ 
 void push_countarray();
-void set_parenttag(char* tag);
+void set_parenttag(const char* tag);
 char* get_parenttag(int offset); 
 void set_parentctxt(Gedcom_ctxt ctxt);
 Gedcom_ctxt get_parentctxt(int offset);
@@ -3816,7 +3816,7 @@ void push_countarray()
   }
 }
 
-void set_parenttag(char* tag)
+void set_parenttag(const char* tag)
 {
   strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1);
 }

diff --git a/gedcom/gedcom_internal.h b/gedcom/gedcom_internal.h
index 5a199dd65c62e78853f79785919a0103006e4363..e34318144869dede3c2e6b7870fd1cce6f823ca8 100644 (file)
--- a/gedcom/gedcom_internal.h
+++ b/gedcom/gedcom_internal.h
@@ -57,7 +57,7 @@ struct tag_struct {
 int        gedcom_parse();
 int        gedcom_lex();
 
-void       gedcom_mem_error(char *filename, int line);
+void       gedcom_mem_error(const char *filename, int line);
 
 #define MEMORY_ERROR gedcom_mem_error(__FILE__, __LINE__)
 

diff --git a/gedcom/gedcom_lex_common.c b/gedcom/gedcom_lex_common.c
index 0a01f150596f26e2666b6237b17c92613edfb1a8..3785da2a8960d7bec5cd88a92e3bcf87f93450f3 100644 (file)
--- a/gedcom/gedcom_lex_common.c
+++ b/gedcom/gedcom_lex_common.c
@@ -51,7 +51,7 @@ void message_handler(Gedcom_msg_type type, char *msg)
   fprintf(stderr, "(%d) %s\n", type, msg);
 }
 
-int test_loop(ENCODING enc, char* code)
+int test_loop(ENCODING enc, const char* code)
 {
   int tok, res;
   init_encodings();
@@ -109,18 +109,18 @@ static void error_level_too_high(int level_diff)
                level_diff); 
 }
 
-static void error_tag_too_long(char *tag)
+static void error_tag_too_long(const char *tag)
 {
   gedcom_error(_("Tag '%s' too long, max %d characters allowed"),
               tag, MAXGEDCTAGLEN); 
 }
 
-static void error_invalid_character(char *str, char ch)
+static void error_invalid_character(const char *str, char ch)
 {
   gedcom_error(_("Invalid character for encoding: '%s' (0x%02x)"), str, ch); 
 }
 
-static void error_pointer_too_long(char *ptr)
+static void error_pointer_too_long(const char *ptr)
 {
   gedcom_error(_("Pointer '%s' too long, max %d characters allowed"),
               ptr, MAXGEDCPTRLEN);
@@ -131,7 +131,7 @@ static void error_at_character()
   gedcom_error(_("'@' character should be written as '@@' in values"));
 }
 
-static void error_unexpected_character(char* str, char ch)
+static void error_unexpected_character(const char* str, char ch)
 {
   gedcom_error(_("Unexpected character: '%s' (0x%02x)"), str, ch);
 }

diff --git a/gedcom/interface.c b/gedcom/interface.c
index 0522f05db636c8ce7323cb7761fd7881d711ccc3..d22f8e6755c572a2a560b0d9ab91b7cc7228caad 100644 (file)
--- a/gedcom/interface.c
+++ b/gedcom/interface.c
@@ -102,10 +102,10 @@ void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
     (*cb)(elt, parent, self, parsed_value);
 }
 
-char* val_type_str[] = { N_("null value"),
-                        N_("character string"),
-                        N_("date"),
-                         N_("cross-reference") };
+const char* val_type_str[] = { N_("null value"),
+                              N_("character string"),
+                              N_("date"),
+                              N_("cross-reference") };
 
 void gedcom_cast_error(const char* file, int line,
                       Gedcom_val_type tried_type,

diff --git a/gedcom/message.c b/gedcom/message.c
index 62954b4cc53f6a8ba395d1ae20a7bec37a1c7a13..738bcd099bce23a58864841dcd3e51639edb9567 100644 (file)
--- a/gedcom/message.c
+++ b/gedcom/message.c
@@ -140,7 +140,7 @@ int gedcom_error(const char* s, ...)
   return res;
 }
 
-void gedcom_mem_error(char *filename, int line)
+void gedcom_mem_error(const char *filename, int line)
 {
   gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
 }

diff --git a/gedcom/xref.c b/gedcom/xref.c
index d07f387b3ad843a3f42e83faef808cb4d8a82eb4..a9979181653d14d513ceca7ea379042c9ca613a0 100644 (file)
--- a/gedcom/xref.c
+++ b/gedcom/xref.c
@@ -28,17 +28,17 @@
 struct xref_value def_xref_val = { XREF_NONE, "<error>", NULL };
 static hash_t *xrefs = NULL;
 
-char* xref_type_str[] = { N_("nothing"),
-                          N_("a family"),
-                         N_("an individual"),
-                         N_("a note"),
-                         N_("a multimedia object"),
-                         N_("a source repository"),
-                         N_("a source"),
-                         N_("a submitter"),
-                         N_("a submission record"),
-                         N_("an application-specific record"),
-                        };
+const char* xref_type_str[] = { N_("nothing"),
+                               N_("a family"),
+                               N_("an individual"),
+                               N_("a note"),
+                               N_("a multimedia object"),
+                               N_("a source repository"),
+                               N_("a source"),
+                               N_("a submitter"),
+                               N_("a submission record"),
+                               N_("an application-specific record"),
+                              };
 
 struct xref_node {
   struct xref_value xref;
@@ -144,7 +144,7 @@ struct xref_value *gedcom_get_by_xref(const char *key)
     return NULL;
 }
 
-struct xref_value *gedcom_parse_xref(char *raw_value,
+struct xref_value *gedcom_parse_xref(const char *raw_value,
                                     Xref_ctxt ctxt, Xref_type xref_type)
 {
   struct xref_node *xr = NULL;
@@ -154,7 +154,7 @@ struct xref_value *gedcom_parse_xref(char *raw_value,
     xr = (struct xref_node *)hnode_get(node);
   }
   else {
-    char *key = strdup(raw_value);
+    const char *key = strdup(raw_value);
     if (key) {
       xr = make_xref_node();
       xr->xref.type = xref_type;

diff --git a/gedcom/xref.h b/gedcom/xref.h
index a60a4ec47fda3361487a9404498cf4f38bcc9ca3..373680f8731c7a69e659b9c9d5479c91dffb6d92 100644 (file)
--- a/gedcom/xref.h
+++ b/gedcom/xref.h
@@ -34,7 +34,7 @@ typedef enum _XREF_CTXT {
 void make_xref_table();
 int check_xref_table();
 
-struct xref_value *gedcom_parse_xref(char *raw_value,
+struct xref_value *gedcom_parse_xref(const char *raw_value,
                                     Xref_ctxt ctxt, Xref_type type);
 
 #define GEDCOM_MAKE_XREF_PTR(VAR, XREF) \