diff --git a/include/ntcore_c.h b/include/ntcore_c.h index d506b93963..81199233c5 100644 --- a/include/ntcore_c.h +++ b/include/ntcore_c.h @@ -369,35 +369,31 @@ double *NT_AllocateDoubleArray(size_t size); int *NT_AllocateBooleanArray(size_t size); -struct NT_String *NT_AllocateNTStringArray(size_t size); +struct NT_String *NT_AllocateStringArray(size_t size); void NT_FreeDoubleArray(double *v_double); void NT_FreeBooleanArray(int *v_boolean); void NT_FreeStringArray(struct NT_String *v_string, size_t arr_size); -enum NT_Type NT_GetTypeFromValue(const struct NT_Value *value); +enum NT_Type NT_GetValueType(const struct NT_Value *value); -int NT_GetEntryBooleanFromValue(const struct NT_Value *value, - unsigned long long *last_change, - int *v_boolean); -int NT_GetEntryDoubleFromValue(const struct NT_Value *value, +int NT_GetValueBoolean(const struct NT_Value *value, + unsigned long long *last_change, int *v_boolean); +int NT_GetValueDouble(const struct NT_Value *value, + unsigned long long *last_change, double *v_double); +char *NT_GetValueString(const struct NT_Value *value, + unsigned long long *last_change, size_t *str_len); +char *NT_GetValueRaw(const struct NT_Value *value, + unsigned long long *last_change, size_t *raw_len); + +int *NT_GetValueBooleanArray(const struct NT_Value *value, + unsigned long long *last_change, size_t *arr_size); +double *NT_GetValueDoubleArray(const struct NT_Value *value, unsigned long long *last_change, - double *v_double); -char *NT_GetEntryStringFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *str_len); -char *NT_GetEntryRawFromValue(const struct NT_Value *value, - unsigned long long *last_change, size_t *raw_len); - -int *NT_GetEntryBooleanArrayFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *arr_size); -double *NT_GetEntryDoubleArrayFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *arr_size); -NT_String *NT_GetEntryStringArrayFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *arr_size); + size_t *arr_size); +NT_String *NT_GetValueStringArray(const struct NT_Value *value, + unsigned long long *last_change, + size_t *arr_size); int NT_GetEntryBoolean(const char *name, size_t name_len, unsigned long long *last_change, int *v_boolean); @@ -431,9 +427,8 @@ int NT_SetEntryBooleanArray(const char *name, size_t name_len, const int *arr, size_t size, int force); int NT_SetEntryDoubleArray(const char *name, size_t name_len, const double *arr, size_t size, int force); -int NT_SetEntryNTStringArray(const char *name, size_t name_len, - const struct NT_String *arr, size_t size, - int force); +int NT_SetEntryStringArray(const char *name, size_t name_len, + const struct NT_String *arr, size_t size, int force); #ifdef __cplusplus } diff --git a/ntcore.def b/ntcore.def index 7daeb42ba7..d56db3c1e5 100644 --- a/ntcore.def +++ b/ntcore.def @@ -44,18 +44,18 @@ NT_DisposeRpcCallInfo @45 NT_GetType @46 NT_AllocateDoubleArray @47 NT_AllocateBooleanArray @48 -NT_AllocateNTStringArray @49 +NT_AllocateStringArray @49 NT_FreeDoubleArray @51 NT_FreeBooleanArray @52 NT_FreeStringArray @53 -NT_GetTypeFromValue @54 -NT_GetEntryBooleanFromValue @55 -NT_GetEntryDoubleFromValue @56 -NT_GetEntryStringFromValue @57 -NT_GetEntryRawFromValue @58 -NT_GetEntryBooleanArrayFromValue @59 -NT_GetEntryDoubleArrayFromValue @60 -NT_GetEntryStringArrayFromValue @61 +NT_GetValueType @54 +NT_GetValueBoolean @55 +NT_GetValueDouble @56 +NT_GetValueString @57 +NT_GetValueRaw @58 +NT_GetValueBooleanArray @59 +NT_GetValueDoubleArray @60 +NT_GetValueStringArray @61 NT_GetEntryBoolean @62 NT_GetEntryDouble @63 NT_GetEntryString @64 @@ -69,7 +69,7 @@ NT_SetEntryString @71 NT_SetEntryRaw @72 NT_SetEntryBooleanArray @73 NT_SetEntryDoubleArray @74 -NT_SetEntryNTStringArray @75 +NT_SetEntryStringArray @75 NT_DisposeEntryInfoArray @76 NT_AllocateCharArray @77 diff --git a/src/ntcore_c.cpp b/src/ntcore_c.cpp index 6611fa7466..61ee908931 100644 --- a/src/ntcore_c.cpp +++ b/src/ntcore_c.cpp @@ -475,7 +475,7 @@ double *NT_AllocateDoubleArray(size_t size) { } /* Allocates an NT_String array of the specified size. */ -struct NT_String *NT_AllocateNTStringArray(size_t size) { +struct NT_String *NT_AllocateStringArray(size_t size) { NT_String *retVal = static_cast(std::malloc(size * sizeof(NT_String))); return retVal; @@ -564,9 +564,9 @@ int NT_SetEntryDoubleArray(const char *name, size_t name_len, const double *arr, } } -int NT_SetEntryNTStringArray(const char *name, size_t name_len, - const struct NT_String *arr, size_t size, - int force) { +int NT_SetEntryStringArray(const char *name, size_t name_len, + const struct NT_String *arr, size_t size, + int force) { std::vector v; v.reserve(size); for (size_t i = 0; i < size; ++i) v.push_back(ConvertFromC(arr[i])); @@ -581,32 +581,29 @@ int NT_SetEntryNTStringArray(const char *name, size_t name_len, } } -enum NT_Type NT_GetTypeFromValue(const struct NT_Value *value) { +enum NT_Type NT_GetValueType(const struct NT_Value *value) { if (!value) return NT_Type::NT_UNASSIGNED; return value->type; } -int NT_GetEntryBooleanFromValue(const struct NT_Value *value, - unsigned long long *last_change, - int *v_boolean) { +int NT_GetValueBoolean(const struct NT_Value *value, + unsigned long long *last_change, int *v_boolean) { if (!value || value->type != NT_Type::NT_BOOLEAN) return 0; *v_boolean = value->data.v_boolean; *last_change = value->last_change; return 1; } -int NT_GetEntryDoubleFromValue(const struct NT_Value *value, - unsigned long long *last_change, - double *v_double) { +int NT_GetValueDouble(const struct NT_Value *value, + unsigned long long *last_change, double *v_double) { if (!value || value->type != NT_Type::NT_DOUBLE) return 0; *last_change = value->last_change; *v_double = value->data.v_double; return 1; } -char *NT_GetEntryStringFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *str_len) { +char *NT_GetValueString(const struct NT_Value *value, + unsigned long long *last_change, size_t *str_len) { if (!value || value->type != NT_Type::NT_STRING) return nullptr; *last_change = value->last_change; *str_len = value->data.v_string.len; @@ -615,9 +612,8 @@ char *NT_GetEntryStringFromValue(const struct NT_Value *value, return str; } -char *NT_GetEntryRawFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *raw_len) { +char *NT_GetValueRaw(const struct NT_Value *value, + unsigned long long *last_change, size_t *raw_len) { if (!value || value->type != NT_Type::NT_RAW) return nullptr; *last_change = value->last_change; *raw_len = value->data.v_string.len; @@ -626,9 +622,9 @@ char *NT_GetEntryRawFromValue(const struct NT_Value *value, return raw; } -int *NT_GetEntryBooleanArrayFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *arr_size) { +int *NT_GetValueBooleanArray(const struct NT_Value *value, + unsigned long long *last_change, + size_t *arr_size) { if (!value || value->type != NT_Type::NT_BOOLEAN_ARRAY) return nullptr; *last_change = value->last_change; *arr_size = value->data.arr_boolean.size; @@ -638,9 +634,9 @@ int *NT_GetEntryBooleanArrayFromValue(const struct NT_Value *value, return arr; } -double *NT_GetEntryDoubleArrayFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *arr_size) { +double *NT_GetValueDoubleArray(const struct NT_Value *value, + unsigned long long *last_change, + size_t *arr_size) { if (!value || value->type != NT_Type::NT_DOUBLE_ARRAY) return nullptr; *last_change = value->last_change; *arr_size = value->data.arr_double.size; @@ -651,9 +647,9 @@ double *NT_GetEntryDoubleArrayFromValue(const struct NT_Value *value, return arr; } -NT_String *NT_GetEntryStringArrayFromValue(const struct NT_Value *value, - unsigned long long *last_change, - size_t *arr_size) { +NT_String *NT_GetValueStringArray(const struct NT_Value *value, + unsigned long long *last_change, + size_t *arr_size) { if (!value || value->type != NT_Type::NT_STRING_ARRAY) return nullptr; *last_change = value->last_change; *arr_size = value->data.arr_string.size;