#include <stdlib.h>
#include <string.h>
-#include "utf8-locale.h"
+#include "utf8tools.h"
#include "gom.h"
#include "gom_internal.h"
return data;
}
-char* gom_get_string_locale(char* data, int* conversion_failures)
+char* gom_get_string_for_locale(char* data, int* conversion_failures)
{
return convert_utf8_to_locale(gom_get_string(data), conversion_failures);
}
-char* gom_set_string(char** data, const char* utf8_value)
+char* gom_set_string(char** data, const char* utf8_str)
{
char* result = NULL;
- char* newptr = strdup(utf8_value);
-
- 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;
}
-char* gom_set_string_locale(char** data, const char* locale_value)
+char* gom_set_string_for_locale(char** data, const char* locale_str)
{
- return gom_set_string(data, convert_locale_to_utf8(locale_value));
+ 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;
}