#include <stdlib.h>
#include <string.h>
-#include "utf8-locale.h"
+#include <time.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)
+{
+ 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;
+}
+
+int update_date(struct date_value** dv, struct tm* tm_ptr)
{
- return gom_set_string(data, convert_locale_to_utf8(locale_value));
+ int result;
+ struct date_value* dval = gedcom_new_date_value(NULL);
+ dval->type = DV_NO_MODIFIER;
+ dval->date1.cal = CAL_GREGORIAN;
+ dval->date1.day = tm_ptr->tm_mday;
+ dval->date1.month = tm_ptr->tm_mon + 1;
+ dval->date1.year = tm_ptr->tm_year + 1900;
+ result = gedcom_normalize_date(DI_FROM_NUMBERS, dval);
+
+ if (result == 0) {
+ if (*dv) free(*dv);
+ *dv = dval;
+ }
+ return result;
}
+
+int update_time(char** tv, struct tm* tm_ptr)
+{
+ char tval[16];
+ sprintf(tval, "%02d:%02d:%02d",
+ tm_ptr->tm_hour, tm_ptr->tm_min, tm_ptr->tm_sec);
+
+ if (gom_set_string(tv, tval))
+ return 0;
+ else
+ return 1;
+}
+