Definition of MAKELINKFUNC.

[gedcom-parse.git] / gom / gom_modify.c

diff --git a/gom/gom_modify.c b/gom/gom_modify.c
index f6282568f5ffcbb6db433278c941dd6c304e207d..82205ffb4ca03cc02548ac0ed131aa9a748313b9 100644 (file)
--- a/gom/gom_modify.c
+++ b/gom/gom_modify.c
@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "utf8-locale.h"
+#include "utf8tools.h"
 #include "gom.h"
 #include "gom_internal.h"
 
@@ -45,14 +45,20 @@ char* gom_get_string_for_locale(char* data, int* conversion_failures)
 char* gom_set_string(char** data, const char* utf8_str)
 {
   char* result = NULL;
-  char* newptr = strdup(utf8_str);
-  
-  if (!newptr)
-    MEMORY_ERROR;
+  char* newptr;
+
+  if (!is_utf8_string(utf8_str)) {
+    gedcom_error(_("The input '%s' is not a valid UTF-8 string"), utf8_str);
+  }
   else {
-    if (*data) free(*data);
-    *data = newptr;
-    result = *data;
+    newptr = strdup(utf8_str);
+    if (!newptr)
+      MEMORY_ERROR;
+    else {
+      if (*data) free(*data);
+      *data = newptr;
+      result = *data;
+    }
   }
   
   return result;
@@ -60,5 +66,41 @@ char* gom_set_string(char** data, const char* utf8_str)
 
 char* gom_set_string_for_locale(char** data, const char* locale_str)
 {
-  return gom_set_string(data, convert_locale_to_utf8(locale_str));
+  char* result = NULL;
+  char* utf8_str = convert_locale_to_utf8(locale_str);
+  
+  if (!utf8_str)
+    gedcom_error(_("The input '%s' is not a valid string for the locale"),
+                locale_str);
+  else
+    result = gom_set_string(data, utf8_str);
+
+  return result;
+}
+
+struct xref_value* gom_set_xref_value(struct xref_value** data,
+                                     struct xref_value* newval)
+{
+  struct xref_value* result = NULL;
+  if (data) {
+    /* Unreference the old value if not NULL */
+    if (*data)
+      result = gedcom_unlink_xref((*data)->type, (*data)->string);
+    else
+      result = newval;
+
+    /* Reference the new value if not NULL */
+    if (result != NULL && newval) {
+      result = gedcom_link_xref(newval->type, newval->string);
+      /* On error, perform rollback to old value (guaranteed to work) */
+      if (result == NULL)
+       gedcom_link_xref((*data)->type, (*data)->string);
+    }
+    
+    if (result != NULL) {
+      *data = newval;
+      result = newval;
+    }
+  }
+  return result;
 }