Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rest_vol_datatype: (fix) UTF-8 character set #111

Merged
merged 1 commit into from
Jan 16, 2024
Merged

rest_vol_datatype: (fix) UTF-8 character set #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/rest_vol_datatype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1712,7 +1712,7 @@ RV_convert_JSON_to_datatype(const char *type)
#endif

/* Currently, only H5T_CSET_ASCII character set is supported */
if (strcmp(charSet, "H5T_CSET_ASCII"))
if (strcmp(charSet, "H5T_CSET_ASCII") && strcmp(charSet, "H5T_CSET_UTF8"))
FUNC_GOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
"unsupported character set for string datatype");

Expand Down Expand Up @@ -1747,9 +1747,12 @@ RV_convert_JSON_to_datatype(const char *type)
if ((datatype = H5Tcreate(H5T_STRING, is_variable_str ? H5T_VARIABLE : (size_t)fixed_length)) < 0)
FUNC_GOTO_ERROR(H5E_DATATYPE, H5E_CANTCREATE, FAIL, "can't create string datatype");

if (H5Tset_cset(datatype, H5T_CSET_ASCII) < 0)
if (!strcmp(charSet, "H5T_CSET_ASCII") && (H5Tset_cset(datatype, H5T_CSET_ASCII) < 0))
FUNC_GOTO_ERROR(H5E_DATATYPE, H5E_CANTCREATE, FAIL,
"can't set character set for string datatype");
"can't set ASCII character set for string datatype");
if (!strcmp(charSet, "H5T_CSET_UTF8") && (H5Tset_cset(datatype, H5T_CSET_UTF8) < 0))
FUNC_GOTO_ERROR(H5E_DATATYPE, H5E_CANTCREATE, FAIL,
"can't set UTF-8 character set for string datatype");

if (H5Tset_strpad(datatype, is_variable_str ? H5T_STR_NULLTERM : H5T_STR_NULLPAD) < 0)
FUNC_GOTO_ERROR(H5E_DATATYPE, H5E_CANTCREATE, FAIL,
Expand Down