diff --git a/source/c_api/accAPI.cpp b/source/c_api/accAPI.cpp index bd342d2a..b6ea3ffe 100644 --- a/source/c_api/accAPI.cpp +++ b/source/c_api/accAPI.cpp @@ -3945,5 +3945,5 @@ LOGMALLOCLIST* udaGetLogMallocList(int handle) NTREE* udaFindNTreeStructureDefinition(NTREE* node, const char* target) { - return findNTreeStructureDefinition(node, target); + return udaFindNTreeStructureDefinition(node, target); } diff --git a/source/client/udaClient.cpp b/source/client/udaClient.cpp index 2ff490aa..71708af4 100644 --- a/source/client/udaClient.cpp +++ b/source/client/udaClient.cpp @@ -1707,7 +1707,7 @@ const char* udaGetServerErrorStackRecordMsg(int record) /** @return the error message stack data structure */ -UDA_ERROR_STACK* getUdaServerErrorStack() +UDA_ERROR_STACK* udaGetServerErrorStack() { return &server_block.idamerrorstack; // Server Error Stack Structure } diff --git a/source/plugins/help/help_plugin.cpp b/source/plugins/help/help_plugin.cpp index db87cc65..3e4ebfeb 100644 --- a/source/plugins/help/help_plugin.cpp +++ b/source/plugins/help/help_plugin.cpp @@ -62,9 +62,9 @@ int HelpPlugin::ping(UDA_PLUGIN_INTERFACE* plugin_interface) usertype.idamclass = UDA_TYPE_COMPOUND; int offset = 0; - defineField(&field, "seconds", "Server time in seconds from the epoch start", &offset, SCALARUINT); + udaDefineField(&field, "seconds", "Server time in seconds from the epoch start", &offset, SCALARUINT); udaAddCompoundField(&usertype, field); - defineField(&field, "microseconds", "Server inter-second time in microseconds", &offset, SCALARUINT); + udaDefineField(&field, "microseconds", "Server inter-second time in microseconds", &offset, SCALARUINT); udaAddCompoundField(&usertype, field); USERDEFINEDTYPELIST* userdefinedtypelist = plugin_interface->userdefinedtypelist; diff --git a/source/plugins/testplugin/testplugin.cpp b/source/plugins/testplugin/testplugin.cpp index d5aa9d2a..b84a88f8 100644 --- a/source/plugins/testplugin/testplugin.cpp +++ b/source/plugins/testplugin/testplugin.cpp @@ -2321,12 +2321,12 @@ int TestPlugin::test30(UDA_PLUGIN_INTERFACE* plugin_interface) COMPOUNDFIELD field; udaInitCompoundField(&field); - defineField(&field, "R", "double structure element", &offset, SCALARDOUBLE); + udaDefineField(&field, "R", "double structure element", &offset, SCALARDOUBLE); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "Z", "double structure element", &offset, SCALARDOUBLE); + udaDefineField(&field, "Z", "double structure element", &offset, SCALARDOUBLE); udaAddCompoundField(&usertype, field); @@ -2385,12 +2385,12 @@ int TestPlugin::test31(UDA_PLUGIN_INTERFACE* plugin_interface) COMPOUNDFIELD field; udaInitCompoundField(&field); - defineField(&field, "R", "double structure element", &offset, SCALARDOUBLE); + udaDefineField(&field, "R", "double structure element", &offset, SCALARDOUBLE); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "Z", "double structure element", &offset, SCALARDOUBLE); + udaDefineField(&field, "Z", "double structure element", &offset, SCALARDOUBLE); udaAddCompoundField(&usertype, field); @@ -2462,12 +2462,12 @@ int TestPlugin::test32(UDA_PLUGIN_INTERFACE* plugin_interface) COMPOUNDFIELD field; udaInitCompoundField(&field); - defineField(&field, "R", "double structure element", &offset, SCALARDOUBLE); + udaDefineField(&field, "R", "double structure element", &offset, SCALARDOUBLE); udaAddCompoundField(&usertype, field); // Single Structure element udaInitCompoundField(&field); - defineField(&field, "Z", "double structure element", &offset, SCALARDOUBLE); + udaDefineField(&field, "Z", "double structure element", &offset, SCALARDOUBLE); udaAddCompoundField(&usertype, field); // Single Structure element @@ -2494,7 +2494,7 @@ int TestPlugin::test32(UDA_PLUGIN_INTERFACE* plugin_interface) offset = 0; udaInitCompoundField(&field); - defineField(&field, "count", "int structure element", &offset, SCALARINT); + udaDefineField(&field, "count", "int structure element", &offset, SCALARINT); udaAddCompoundField(&usertype, field); // Single Structure element @@ -2577,12 +2577,12 @@ int TestPlugin::test33(UDA_PLUGIN_INTERFACE* plugin_interface) COMPOUNDFIELD field; udaInitCompoundField(&field); - defineField(&field, "R", "double structure element", &offset, SCALARDOUBLE); + udaDefineField(&field, "R", "double structure element", &offset, SCALARDOUBLE); udaAddCompoundField(&usertype, field); // Single Structure element udaInitCompoundField(&field); - defineField(&field, "Z", "double structure element", &offset, SCALARDOUBLE); + udaDefineField(&field, "Z", "double structure element", &offset, SCALARDOUBLE); udaAddCompoundField(&usertype, field); // Single Structure element @@ -2609,7 +2609,7 @@ int TestPlugin::test33(UDA_PLUGIN_INTERFACE* plugin_interface) offset = 0; udaInitCompoundField(&field); - defineField(&field, "count", "int structure element", &offset, SCALARINT); + udaDefineField(&field, "count", "int structure element", &offset, SCALARINT); udaAddCompoundField(&usertype, field); // Single Structure element @@ -2702,7 +2702,7 @@ int TestPlugin::test34(UDA_PLUGIN_INTERFACE* plugin_interface) field.count = 1; field.rank = 0; field.shape = nullptr; - defineField(&field, "R", "unsigned char structure element", &offset, ARRAYUCHAR); + udaDefineField(&field, "R", "unsigned char structure element", &offset, ARRAYUCHAR); udaAddCompoundField(&usertype, field); // Single Structure element @@ -2710,7 +2710,7 @@ int TestPlugin::test34(UDA_PLUGIN_INTERFACE* plugin_interface) field.count = 1; field.rank = 0; field.shape = nullptr; - defineField(&field, "Z", "unsigned char structure element", &offset, ARRAYUCHAR); + udaDefineField(&field, "Z", "unsigned char structure element", &offset, ARRAYUCHAR); udaAddCompoundField(&usertype, field); // Single Structure element @@ -2737,7 +2737,7 @@ int TestPlugin::test34(UDA_PLUGIN_INTERFACE* plugin_interface) offset = 0; udaInitCompoundField(&field); - defineField(&field, "count", "int structure element", &offset, SCALARINT); + udaDefineField(&field, "count", "int structure element", &offset, SCALARINT); udaAddCompoundField(&usertype, field); // Single Structure element @@ -2866,17 +2866,17 @@ int TestPlugin::test40(UDA_PLUGIN_INTERFACE* plugin_interface) return err; } - defineField(&field, "dataCount", "the number of data array elements", &offset, SCALARUINT); + udaDefineField(&field, "dataCount", "the number of data array elements", &offset, SCALARUINT); switch (request_block->putDataBlockList.putDataBlock[0].data_type) { case UDA_TYPE_INT: - defineField(&field, "data", "the block data array", &offset, ARRAYINT); + udaDefineField(&field, "data", "the block data array", &offset, ARRAYINT); break; case UDA_TYPE_FLOAT: - defineField(&field, "data", "the block data array", &offset, ARRAYFLOAT); + udaDefineField(&field, "data", "the block data array", &offset, ARRAYFLOAT); break; case UDA_TYPE_DOUBLE: - defineField(&field, "data", "the block data array", &offset, ARRAYDOUBLE); + udaDefineField(&field, "data", "the block data array", &offset, ARRAYDOUBLE); break; } @@ -2895,7 +2895,7 @@ int TestPlugin::test40(UDA_PLUGIN_INTERFACE* plugin_interface) offset = 0; udaInitCompoundField(&field); - defineField(&field, "count", "the number of data blocks", &offset, SCALARUINT); + udaDefineField(&field, "count", "the number of data blocks", &offset, SCALARUINT); strcpy(field.name, "blocks"); field.atomictype = UDA_TYPE_UNKNOWN; @@ -3115,7 +3115,7 @@ int TestPlugin::test60(UDA_PLUGIN_INTERFACE* plugin_interface) udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "value", "The ENUM value", &offset, SCALARLONG64); + udaDefineField(&field, "value", "The ENUM value", &offset, SCALARLONG64); udaAddCompoundField(&usertype, field); udaAddUserDefinedType(userdefinedtypelist, usertype); @@ -3150,11 +3150,11 @@ int TestPlugin::test60(UDA_PLUGIN_INTERFACE* plugin_interface) udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "type", "The ENUM base integer atomic type", &offset, SCALARINT); + udaDefineField(&field, "type", "The ENUM base integer atomic type", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "count", "The number of ENUM values", &offset, SCALARINT); + udaDefineField(&field, "count", "The number of ENUM values", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); @@ -3176,40 +3176,40 @@ int TestPlugin::test60(UDA_PLUGIN_INTERFACE* plugin_interface) udaInitCompoundField(&field); switch (enumlist->type) { case (UDA_TYPE_UNSIGNED_SHORT): { - defineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYUSHORT); + udaDefineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYUSHORT); break; } case (UDA_TYPE_SHORT): { - defineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYSHORT); + udaDefineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYSHORT); break; } case (UDA_TYPE_UNSIGNED_INT): { - defineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYUINT); + udaDefineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYUINT); break; } case (UDA_TYPE_INT): { - defineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYINT); + udaDefineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYINT); break; } case (UDA_TYPE_UNSIGNED_LONG64): { - defineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYULONG64); + udaDefineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYULONG64); break; } case (UDA_TYPE_LONG64): { - defineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYLONG64); + udaDefineField(&field, "arraydata", "The array of values defined by the ENUM", &offset, ARRAYLONG64); break; } } udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "arraydata_rank", "The rank of arraydata", &offset, SCALARINT); + udaDefineField(&field, "arraydata_rank", "The rank of arraydata", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "arraydata_count", "The count of arraydata", &offset, SCALARINT); + udaDefineField(&field, "arraydata_count", "The count of arraydata", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "arraydata_shape", "The shape of arraydata", &offset, ARRAYINT); + udaDefineField(&field, "arraydata_shape", "The shape of arraydata", &offset, ARRAYINT); udaAddCompoundField(&usertype, field); udaAddUserDefinedType(userdefinedtypelist, usertype); @@ -3309,7 +3309,7 @@ int TestPlugin::test61(UDA_PLUGIN_INTERFACE* plugin_interface) udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "value", "The ENUM value", &offset, SCALARLONG64); + udaDefineField(&field, "value", "The ENUM value", &offset, SCALARLONG64); udaAddCompoundField(&usertype, field); udaAddUserDefinedType(userdefinedtypelist, usertype); @@ -3343,11 +3343,11 @@ int TestPlugin::test61(UDA_PLUGIN_INTERFACE* plugin_interface) udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "type", "The ENUM base integer atomic type", &offset, SCALARINT); + udaDefineField(&field, "type", "The ENUM base integer atomic type", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "count", "The number of ENUM values", &offset, SCALARINT); + udaDefineField(&field, "count", "The number of ENUM values", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); @@ -3367,17 +3367,17 @@ int TestPlugin::test61(UDA_PLUGIN_INTERFACE* plugin_interface) udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "arraydata", "Data with this enumerated type", &offset, + udaDefineField(&field, "arraydata", "Data with this enumerated type", &offset, ARRAYULONG64); // Data need to be converted to this type udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "arraydata_rank", "The rank of arraydata", &offset, SCALARINT); + udaDefineField(&field, "arraydata_rank", "The rank of arraydata", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "arraydata_count", "The count of arraydata", &offset, SCALARINT); + udaDefineField(&field, "arraydata_count", "The count of arraydata", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "arraydata_shape", "The shape of arraydata", &offset, ARRAYINT); + udaDefineField(&field, "arraydata_shape", "The shape of arraydata", &offset, ARRAYINT); udaAddCompoundField(&usertype, field); udaAddUserDefinedType(userdefinedtypelist, usertype); diff --git a/source/structures/accessors.cpp b/source/structures/accessors.cpp index 17dce831..7dfc705b 100644 --- a/source/structures/accessors.cpp +++ b/source/structures/accessors.cpp @@ -23,28 +23,28 @@ // // Component means named data member. Not the name of the structure type. // -// findNTreeStructureComponent data structure member name -// findNTreeStructureComponentDefinition data structure member's user defined type name -// findNTreeStructure tree node name -// findNTreeStructureMalloc memory address of the data -// findNTreeStructureDefinition user defined type name +// udaFindNTreeStructureComponent data structure member name +// udaFindNTreeStructureComponentDefinition data structure member's user defined type name +// udaFindNTreeStructure tree node name +// udaFindNTreeStructureMalloc memory address of the data +// udaFindNTreeStructureDefinition user defined type name // -// findNTreeChildStructureComponent data structure member name within the child nodes only -// findNTreeChildStructure tree node name within the child nodes only +// udaFindNTreeChildStructureComponent data structure member name within the child nodes only +// udaFindNTreeChildStructure tree node name within the child nodes only // // udaFindNTreeStructureClass user defined type class id // udaMaxCountVlenStructureArray // udaRegulariseVlenStructures // udaRegulariseVlenData // -// getNodeStructureDataCount -// getNodeStructureDataSize -// getNodeStructureDataRank -// getNodeStructureDataShape -// getNodeStructureDataDataType -// getNodeStructureData +// udaGetNodeStructureDataCount +// udaGetNodeStructureDataSize +// udaGetNodeStructureDataRank +// udaGetNodeStructureDataShape +// udaGetNodeStructureDataDataType +// udaGetNodeStructureData // -// printImage +// udaPrintImage // #include "accessors.h" @@ -65,7 +65,7 @@ * @return the Tree Node containing the named element. */ -NTREE* findNTreeStructureComponent1(NTREE* ntree, const char* target) +NTREE* udaFindNTreeStructureComponent1(NTREE* ntree, const char* target) { if (ntree == nullptr) { ntree = udaGetFullNTree(); @@ -96,7 +96,7 @@ NTREE* findNTreeStructureComponent1(NTREE* ntree, const char* target) for (int i = 0; i < ntree->branches; i++) { NTREE* child = nullptr; - if ((child = findNTreeStructureComponent1(ntree->children[i], target)) != nullptr) { + if ((child = udaFindNTreeStructureComponent1(ntree->children[i], target)) != nullptr) { return child; } } @@ -125,7 +125,7 @@ Search all but the last on the child tree nodes. The first name must be searched for down the tree from the root or starting node All subsequent names must be within child nodes unless the last name */ -NTREE* findNTreeStructureComponent2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target, +NTREE* udaFindNTreeStructureComponent2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target, const char** lastname) { if (ntree == nullptr) { @@ -143,7 +143,7 @@ NTREE* findNTreeStructureComponent2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, // Search recursively for the first name NTREE* child = ntree; - if ((child = findNTreeStructureComponent1(child, targetlist[0])) == nullptr) { + if ((child = udaFindNTreeStructureComponent1(child, targetlist[0])) == nullptr) { // Not found return nullptr; } @@ -200,7 +200,7 @@ NTREE* findNTreeStructureComponent2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, *lastname = target; NTREE* child; - if ((child = findNTreeStructureComponent1(ntree, target)) != nullptr) { + if ((child = udaFindNTreeStructureComponent1(ntree, target)) != nullptr) { return child; // Found } @@ -217,7 +217,7 @@ NTREE* findNTreeStructureComponent2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, * @param lastname Returns the name of the Structure, i.e., the name of the last node in the name hierarchy. * @return the Data Tree Node with the structure name. */ -NTREE* findNTreeStructure2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target, const char** lastname) +NTREE* udaFindNTreeStructure2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target, const char** lastname) { if (ntree == nullptr) { ntree = udaGetFullNTree(); @@ -234,12 +234,12 @@ NTREE* findNTreeStructure2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const cha for (int i = 0; i < ntargets; i++) { // Drill Down to requested named structure element if (i < ntargets - 1) { - child = findNTreeStructure2(logmalloclist, child, targetlist[i], lastname); + child = udaFindNTreeStructure2(logmalloclist, child, targetlist[i], lastname); } else { NTREE* test = nullptr; - if ((test = findNTreeStructure2(logmalloclist, child, targetlist[i], lastname)) == + if ((test = udaFindNTreeStructure2(logmalloclist, child, targetlist[i], lastname)) == nullptr) { // Last element may not be a structure - if (findNTreeStructureComponent2(logmalloclist, child, targetlist[i], lastname) == nullptr) { + if (udaFindNTreeStructureComponent2(logmalloclist, child, targetlist[i], lastname) == nullptr) { child = nullptr; } } else { @@ -293,10 +293,10 @@ NTREE* findNTreeStructure2(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const cha * a/b/c. This element may be either a structure itself or an atomic typed element. * @return the Data Tree Node. */ -NTREE* findNTreeStructureComponent(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target) +NTREE* udaFindNTreeStructureComponent(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target) { const char* lastname = nullptr; - return findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); + return udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); } /** Find (search type A) and return a Pointer to the Child Data Tree Node with a data structure that contains a named @@ -309,7 +309,7 @@ NTREE* findNTreeStructureComponent(LOGMALLOCLIST* logmalloclist, NTREE* ntree, c * a/b/c. This element may be either a structure itself or an atomic typed element. * @return the Data Tree Node. */ -NTREE* findNTreeChildStructureComponent(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target) +NTREE* udaFindNTreeChildStructureComponent(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target) { if (ntree == nullptr) { ntree = udaGetFullNTree(); @@ -319,7 +319,7 @@ NTREE* findNTreeChildStructureComponent(LOGMALLOCLIST* logmalloclist, NTREE* ntr for (int i = 0; i < ntree->branches; i++) { NTREE* child = nullptr; - if ((child = findNTreeStructureComponent(logmalloclist, ntree->children[i], target)) != nullptr) { + if ((child = udaFindNTreeStructureComponent(logmalloclist, ntree->children[i], target)) != nullptr) { return child; } } @@ -335,10 +335,10 @@ NTREE* findNTreeChildStructureComponent(LOGMALLOCLIST* logmalloclist, NTREE* ntr * @param target The name of the Structure (case sensitive) using a hierachical naming syntax a.b.c or a/b/c. * @return the Data Tree Node. */ -NTREE* findNTreeStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target) +NTREE* udaFindNTreeStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target) { const char* lastname = nullptr; - return findNTreeStructure2(logmalloclist, ntree, target, &lastname); + return udaFindNTreeStructure2(logmalloclist, ntree, target, &lastname); } /** Find (search type B) and return a Pointer to the named Data Tree Node with a data structure of the same name. @@ -349,7 +349,7 @@ NTREE* findNTreeStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char * @param target The name of the Structure (case sensitive) using a hierachical naming syntax a.b.c or a/b/c. * @return the child Data Tree Node. */ -NTREE* findNTreeChildStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target) +NTREE* udaFindNTreeChildStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const char* target) { if (ntree == nullptr) { ntree = udaGetFullNTree(); @@ -359,7 +359,7 @@ NTREE* findNTreeChildStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const for (int i = 0; i < ntree->branches; i++) { NTREE* child = nullptr; - if ((child = findNTreeStructure(logmalloclist, ntree->children[i], target)) != nullptr) { + if ((child = udaFindNTreeStructure(logmalloclist, ntree->children[i], target)) != nullptr) { return child; } } @@ -375,7 +375,7 @@ NTREE* findNTreeChildStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree, const * @param data The heap address of the data. * @return the Data Tree Node. */ -NTREE* findNTreeStructureMalloc(NTREE* ntree, void* data) +NTREE* udaFindNTreeStructureMalloc(NTREE* ntree, void* data) { if (ntree == nullptr) { ntree = udaGetFullNTree(); @@ -385,7 +385,7 @@ NTREE* findNTreeStructureMalloc(NTREE* ntree, void* data) } for (int i = 0; i < ntree->branches; i++) { NTREE* next; - if ((next = findNTreeStructureMalloc(ntree->children[i], data)) != nullptr) { + if ((next = udaFindNTreeStructureMalloc(ntree->children[i], data)) != nullptr) { return next; } } @@ -400,7 +400,7 @@ NTREE* findNTreeStructureMalloc(NTREE* ntree, void* data) * @param target The name of the Structure Definition. * @return A pointer to the First tree node found with the targeted structure definition. */ -NTREE* findNTreeStructureDefinition(NTREE* ntree, const char* target) +NTREE* udaFindNTreeStructureDefinition(NTREE* ntree, const char* target) { if (ntree == nullptr) { ntree = udaGetFullNTree(); @@ -416,7 +416,7 @@ NTREE* findNTreeStructureDefinition(NTREE* ntree, const char* target) targetlist = udaParseTarget(target, &ntargets); // Deconstruct the Name and search for each hierarchy group for (int i = 0; i < ntargets; i++) { // Drill Down to requested named structure type - if ((child = findNTreeStructureDefinition(child, targetlist[i])) == nullptr) { + if ((child = udaFindNTreeStructureDefinition(child, targetlist[i])) == nullptr) { break; } } @@ -437,7 +437,7 @@ NTREE* findNTreeStructureDefinition(NTREE* ntree, const char* target) for (int i = 0; i < ntree->branches; i++) { NTREE* child = nullptr; - if ((child = findNTreeStructureDefinition(ntree->children[i], target)) != nullptr) { + if ((child = udaFindNTreeStructureDefinition(ntree->children[i], target)) != nullptr) { return child; } } @@ -445,7 +445,7 @@ NTREE* findNTreeStructureDefinition(NTREE* ntree, const char* target) return nullptr; } -NTREE* xfindNTreeStructureDefinition(NTREE* tree, const char* target) +NTREE* xudaFindNTreeStructureDefinition(NTREE* tree, const char* target) { if (tree == nullptr) { tree = udaGetFullNTree(); @@ -457,7 +457,7 @@ NTREE* xfindNTreeStructureDefinition(NTREE* tree, const char* target) for (int i = 0; i < tree->branches; i++) { NTREE* next; - if ((next = findNTreeStructureDefinition(tree->children[i], target)) != nullptr) { + if ((next = udaFindNTreeStructureDefinition(tree->children[i], target)) != nullptr) { return next; } } @@ -473,7 +473,7 @@ NTREE* xfindNTreeStructureDefinition(NTREE* tree, const char* target) * @param target The name of the Structure Definition. * @return A pointer to the First tree node found with the targeted structure definition. */ -NTREE* findNTreeStructureComponentDefinition(NTREE* tree, const char* target) +NTREE* udaFindNTreeStructureComponentDefinition(NTREE* tree, const char* target) { NTREE* next; @@ -489,7 +489,7 @@ NTREE* findNTreeStructureComponentDefinition(NTREE* tree, const char* target) } for (int i = 0; i < tree->branches; i++) { - if ((next = findNTreeStructureComponentDefinition(tree->children[i], target)) != nullptr) { + if ((next = udaFindNTreeStructureComponentDefinition(tree->children[i], target)) != nullptr) { return next; } } @@ -695,7 +695,7 @@ int udaRegulariseVlenData(LOGMALLOCLIST* logmalloclist, NTREE* tree, USERDEFINED * @param ntree A pointer to a tree node. If nullptr the root node is assumed. * @return the Count of structured data array elements. */ -int getNodeStructureDataCount(LOGMALLOCLIST* logmalloclist, NTREE* ntree) +int udaGetNodeStructureDataCount(LOGMALLOCLIST* logmalloclist, NTREE* ntree) { int count, size; const char* type; @@ -713,7 +713,7 @@ int getNodeStructureDataCount(LOGMALLOCLIST* logmalloclist, NTREE* ntree) * @param ntree A pointer to a tree node. If nullptr the root node is assumed. * @return the Size (bytes) of the structured data array. */ -int getNodeStructureDataSize(LOGMALLOCLIST* logmalloclist, NTREE* ntree) +int udaGetNodeStructureDataSize(LOGMALLOCLIST* logmalloclist, NTREE* ntree) { int count, size; const char* type; @@ -731,7 +731,7 @@ int getNodeStructureDataSize(LOGMALLOCLIST* logmalloclist, NTREE* ntree) * @param ntree A pointer to a tree node. If nullptr the root node is assumed. * @return The rank of the structured data array. */ -int getNodeStructureDataRank(LOGMALLOCLIST* logmalloclist, NTREE* ntree) +int udaGetNodeStructureDataRank(LOGMALLOCLIST* logmalloclist, NTREE* ntree) { int count, size, rank; int* shape; @@ -750,7 +750,7 @@ int getNodeStructureDataRank(LOGMALLOCLIST* logmalloclist, NTREE* ntree) * @param ntree A pointer to a tree node. If nullptr the root node is assumed. * @return A pointer to the integer shape array of the structured data array. */ -int* getNodeStructureDataShape(LOGMALLOCLIST* logmalloclist, NTREE* ntree) +int* udaGetNodeStructureDataShape(LOGMALLOCLIST* logmalloclist, NTREE* ntree) { int count, size, rank; int* shape; @@ -788,7 +788,7 @@ int* getNodeStructureDataShape(LOGMALLOCLIST* logmalloclist, NTREE* ntree) * @param ntree A pointer to a tree node. If nullptr the root node is assumed. * @return the data type name of the structured data array. */ -const char* getNodeStructureDataDataType(LOGMALLOCLIST* logmalloclist, NTREE* ntree) +const char* udaGetNodeStructureDataDataType(LOGMALLOCLIST* logmalloclist, NTREE* ntree) { int count, size; const char* type = nullptr; @@ -806,7 +806,7 @@ const char* getNodeStructureDataDataType(LOGMALLOCLIST* logmalloclist, NTREE* nt * @param ntree A pointer to a tree node. If nullptr the root node is assumed. * @return A void pointer to the data . */ -void* getNodeStructureData(NTREE* ntree) +void* udaGetNodeStructureData(NTREE* ntree) { if (ntree == nullptr) { ntree = udaGetFullNTree(); @@ -827,7 +827,7 @@ void* getNodeStructureData(NTREE* ntree) * @param imagecount The number of bytes in the image text block. * @return Void */ -void printImage(const char* image, int imagecount) +void udaPrintImage(const char* image, int imagecount) { int next = 0; if (image == nullptr || imagecount == '\0') { @@ -851,7 +851,7 @@ void printImage(const char* image, int imagecount) * @param type_id Enumerated key indicating the type of data field, e.g. float array * @return Void */ -void defineField(COMPOUNDFIELD* field, const char* name, const char* desc, int* offset, unsigned short type_id) +void udaDefineField(COMPOUNDFIELD* field, const char* name, const char* desc, int* offset, unsigned short type_id) { udaInitCompoundField(field); strcpy(field->name, name); @@ -1030,7 +1030,7 @@ void defineField(COMPOUNDFIELD* field, const char* name, const char* desc, int* *offset = field->offset + field->size; // Next Offset } -void defineCompoundField(COMPOUNDFIELD* field, const char* type, const char* name, char* desc, int offset, int size) +void udaDefineCompoundField(COMPOUNDFIELD* field, const char* type, const char* name, char* desc, int offset, int size) { udaInitCompoundField(field); diff --git a/source/structures/struct.cpp b/source/structures/struct.cpp index 80fd0e0e..33912602 100644 --- a/source/structures/struct.cpp +++ b/source/structures/struct.cpp @@ -432,7 +432,7 @@ void udaPrintUserDefinedType(USERDEFINEDTYPE str) UDA_LOG(UDA_LOG_DEBUG, "size : %d\n", str.size); UDA_LOG(UDA_LOG_DEBUG, "fieldcount : %d\n", str.fieldcount); - printImage(str.image, str.imagecount); + udaPrintImage(str.image, str.imagecount); UDA_LOG(UDA_LOG_DEBUG, "\n"); if (str.compoundfield != nullptr) { @@ -1205,13 +1205,13 @@ void udaGetInitialUserDefinedTypeList(USERDEFINEDTYPELIST** anew) offset = 0; - defineField(&field, "count", "Number of data array elements", &offset, SCALARINT); + udaDefineField(&field, "count", "Number of data array elements", &offset, SCALARINT); udaAddCompoundField(&usertype, field); - defineField(&field, "rank", "Rank of the data array", &offset, SCALARINT); + udaDefineField(&field, "rank", "Rank of the data array", &offset, SCALARINT); udaAddCompoundField(&usertype, field); - defineField(&field, "shape", "Shape of the data array", &offset, ARRAYINT); + udaDefineField(&field, "shape", "Shape of the data array", &offset, ARRAYINT); udaAddCompoundField(&usertype, field); - defineField(&field, "data", "Location of the Structure Array", &offset, ARRAYVOID); + udaDefineField(&field, "data", "Location of the Structure Array", &offset, ARRAYVOID); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); @@ -1265,7 +1265,7 @@ void udaGetInitialUserDefinedTypeList(USERDEFINEDTYPELIST** anew) udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "value", "The ENUM value", &offset, SCALARLONG64); + udaDefineField(&field, "value", "The ENUM value", &offset, SCALARLONG64); udaAddCompoundField(&usertype, field); udaAddUserDefinedType(list, usertype); @@ -1302,11 +1302,11 @@ void udaGetInitialUserDefinedTypeList(USERDEFINEDTYPELIST** anew) udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "type", "The ENUM base integer atomic type", &offset, SCALARINT); + udaDefineField(&field, "type", "The ENUM base integer atomic type", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "count", "The number of ENUM values", &offset, SCALARINT); + udaDefineField(&field, "count", "The number of ENUM values", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); @@ -1325,7 +1325,7 @@ void udaGetInitialUserDefinedTypeList(USERDEFINEDTYPELIST** anew) field.alignment = udaGetalignmentof(field.type); udaAddCompoundField(&usertype, field); - // defineField(&field, "data", "Generalised data pointer for all integer type arrays", &offset, ARRAYVOID); + // udaDefineField(&field, "data", "Generalised data pointer for all integer type arrays", &offset, ARRAYVOID); // ARRAYVOID doesn't work - not implemented in the middleware! // Naming the field "data" hits a bug and garbage is returned! // Don't know the correct type until the structure is used!!!! - so cannot pre-define! @@ -1333,17 +1333,17 @@ void udaGetInitialUserDefinedTypeList(USERDEFINEDTYPELIST** anew) // Convert data to standard unsigned long64 udaInitCompoundField(&field); - defineField(&field, "enumarray", "Data with this enumerated type", &offset, + udaDefineField(&field, "enumarray", "Data with this enumerated type", &offset, ARRAYULONG64); // Data need to be converted to this type udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "enumarray_rank", "The rank of arraydata", &offset, SCALARINT); + udaDefineField(&field, "enumarray_rank", "The rank of arraydata", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "enumarray_count", "The count of arraydata", &offset, SCALARINT); + udaDefineField(&field, "enumarray_count", "The count of arraydata", &offset, SCALARINT); udaAddCompoundField(&usertype, field); udaInitCompoundField(&field); - defineField(&field, "enumarray_shape", "The shape of arraydata", &offset, ARRAYINT); + udaDefineField(&field, "enumarray_shape", "The shape of arraydata", &offset, ARRAYINT); udaAddCompoundField(&usertype, field); udaAddUserDefinedType(list, usertype); @@ -2656,7 +2656,7 @@ COMPOUNDFIELD* getNodeStructureComponent(LOGMALLOCLIST* logmalloclist, NTREE* nt } // Locate the Node with a Structure Component - ntree = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); + ntree = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); if (ntree != nullptr) { userdefinedtype = ntree->userdefinedtype; @@ -2759,7 +2759,7 @@ void udaPrintNodeStructureDefinition(const char* target) { NTREE* ntree = nullptr; if (target[0] != '\0') { - if ((ntree = findNTreeStructureDefinition(ntree, target)) == nullptr) { + if ((ntree = udaFindNTreeStructureDefinition(ntree, target)) == nullptr) { UDA_LOG(UDA_LOG_DEBUG, "the Structure Definition for %s could not be Found\n", target); return; } @@ -2778,11 +2778,11 @@ void udaPrintNodeStructureImage(const char* target) { NTREE* ntree = nullptr; if (target[0] != '\0') { - if ((ntree = findNTreeStructureDefinition(ntree, target)) == nullptr) { + if ((ntree = udaFindNTreeStructureDefinition(ntree, target)) == nullptr) { UDA_LOG(UDA_LOG_DEBUG, "the Structure Definition for %s could not be Found\n", target); return; } - printImage(ntree->userdefinedtype->image, ntree->userdefinedtype->imagecount); + udaPrintImage(ntree->userdefinedtype->image, ntree->userdefinedtype->imagecount); } else { UDA_LOG(UDA_LOG_DEBUG, "no Structure Definition name was given!\n"); } @@ -2857,7 +2857,7 @@ void* udaGetNodeStructureArrayData(LOGMALLOCLIST* logmalloclist, NTREE* ntree, i if (ntree == nullptr) { ntree = udaGetFullNTree(); } - if (getNodeStructureDataCount(logmalloclist, ntree) < (index + 1)) { + if (udaGetNodeStructureDataCount(logmalloclist, ntree) < (index + 1)) { udaAddError(UDA_CODE_ERROR_TYPE, "udaGetNodeStructureArrayData", 999, "The Tree Node array index > allocated array dimension"); return nullptr; @@ -3553,7 +3553,7 @@ int udaGetNodeStructureComponentDataCount(LOGMALLOCLIST* logmalloclist, NTREE* n if (ntree == nullptr) { ntree = udaGetFullNTree(); } - ntree = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name + ntree = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name if (ntree == nullptr) { return 0; } @@ -3599,7 +3599,7 @@ int udaGetNodeStructureComponentDataRank(LOGMALLOCLIST* logmalloclist, NTREE* nt if (ntree == nullptr) { ntree = udaGetFullNTree(); } - ntree = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name + ntree = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name if (ntree == nullptr) { return 0; } @@ -3642,7 +3642,7 @@ int* udaGetNodeStructureComponentDataShape(LOGMALLOCLIST* logmalloclist, NTREE* if (ntree == nullptr) { ntree = udaGetFullNTree(); } - ntree = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name + ntree = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name if (ntree == nullptr) { return nullptr; } @@ -3683,7 +3683,7 @@ int udaGetNodeStructureComponentDataIsPointer(LOGMALLOCLIST* logmalloclist, NTRE if (ntree == nullptr) { ntree = udaGetFullNTree(); } - ntree = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name + ntree = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name if (ntree == nullptr) { return 0; } @@ -3714,7 +3714,7 @@ int udaGetNodeStructureComponentDataSize(LOGMALLOCLIST* logmalloclist, NTREE* nt if (ntree == nullptr) { ntree = udaGetFullNTree(); } - ntree = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name + ntree = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name if (ntree == nullptr) { return 0; } @@ -3753,7 +3753,7 @@ const char* udaGetNodeStructureComponentDataDataType(LOGMALLOCLIST* logmalloclis if (ntree == nullptr) { ntree = udaGetFullNTree(); } - ntree = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name + ntree = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name if (ntree == nullptr) { return "unknown"; } @@ -3792,7 +3792,7 @@ void* udaGetNodeStructureComponentData(LOGMALLOCLIST* logmalloclist, NTREE* ntre if (ntree == nullptr) { ntree = udaGetFullNTree(); } - ntree = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name + ntree = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Identify node and component name if (ntree == nullptr) { return nullptr; } @@ -3841,7 +3841,7 @@ void udaPrintNodeStructureComponentData(NTREE* ntree, LOGMALLOCLIST* logmallocli ntree = udaGetFullNTree(); } - node = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Locate the Node + node = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); // Locate the Node if (ntree == nullptr) { return; } @@ -3953,7 +3953,7 @@ void udaPrintNodeStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree) anamelist = udaGetNodeAtomicNames(logmalloclist, ntree); scount = udaGetNodeStructureCount(ntree); // Count of the Tree Node Structure structure type components snamelist = udaGetNodeStructureNames(logmalloclist, ntree); - count = getNodeStructureDataCount(logmalloclist, ntree); // Count of the Tree Node Structure Array elements + count = udaGetNodeStructureDataCount(logmalloclist, ntree); // Count of the Tree Node Structure Array elements node = ntree; // Start at the base node: all other structure array elements are sibling nodes @@ -3990,7 +3990,7 @@ void udaPrintNodeStructure(LOGMALLOCLIST* logmalloclist, NTREE* ntree) // Structured components must be children of this node. - if ((node2 = findNTreeStructure(logmalloclist, node, snamelist[i])) != nullptr) { + if ((node2 = udaFindNTreeStructure(logmalloclist, node, snamelist[i])) != nullptr) { udaPrintNodeStructure(logmalloclist, node2); } else { UDA_LOG(UDA_LOG_DEBUG, "%40s: null\n", snamelist[i]); @@ -4016,7 +4016,7 @@ float* udaCastNodeStructureComponentDatatoFloat(LOGMALLOCLIST* logmalloclist, NT ntree = udaGetFullNTree(); } - node = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); + node = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); if (ntree == nullptr) { return nullptr; } @@ -4068,7 +4068,7 @@ double* castNodeStructureComponentDatatoDouble(LOGMALLOCLIST* logmalloclist, NTR ntree = udaGetFullNTree(); } - node = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); + node = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); if (ntree == nullptr) { return nullptr; } @@ -4582,7 +4582,7 @@ short* udaCastNodeStructureComponentDatatoShort(LOGMALLOCLIST* logmalloclist, NT ntree = udaGetFullNTree(); } - node = findNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); + node = udaFindNTreeStructureComponent2(logmalloclist, ntree, target, &lastname); if (ntree == nullptr) { return nullptr; } diff --git a/source/wrappers/c++/client.cpp b/source/wrappers/c++/client.cpp index 9bcbac75..bdd81aac 100644 --- a/source/wrappers/c++/client.cpp +++ b/source/wrappers/c++/client.cpp @@ -101,11 +101,11 @@ void uda::Client::setProperty(Property prop, int value) case PROP_TIMEOUT: name = (boost::format("timeout=%1%") % value).str(); - udaSetProperty(name.c_str(), udaClientFlags()); + udaSetProperty(name.c_str()); break; case PROP_ALTRANK: name = (boost::format("altrank=%1%") % value).str(); - udaSetProperty(name.c_str(), udaClientFlags()); + udaSetProperty(name.c_str()); break; default: @@ -183,7 +183,7 @@ int uda::Client::serverPort() [[noreturn]] void generate_exception() { - UDA_ERROR_STACK* errorstack = getUdaServerErrorStack(); + UDA_ERROR_STACK* errorstack = udaGetServerErrorStack(); std::vector backtrace; int code = errorstack->nerrors > 0 ? errorstack->idamerror[0].code : 0; std::string msg = errorstack->nerrors > 0 ? errorstack->idamerror[0].msg : ""; diff --git a/source/wrappers/c++/treenode.cpp b/source/wrappers/c++/treenode.cpp index 24255ff7..63c28dd7 100644 --- a/source/wrappers/c++/treenode.cpp +++ b/source/wrappers/c++/treenode.cpp @@ -63,13 +63,13 @@ void uda::TreeNode::printStructureNames() uda::TreeNode uda::TreeNode::findStructureDefinition(const std::string& name) { - return {handle_, findNTreeStructureDefinition(node_, (char*)name.c_str())}; + return {handle_, udaFindNTreeStructureDefinition(node_, (char*)name.c_str())}; } uda::TreeNode uda::TreeNode::findStructureComponent(const std::string& name) { LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle_); - return {handle_, findNTreeStructureComponent(logmalloclist, node_, (char*)name.c_str())}; + return {handle_, udaFindNTreeStructureComponent(logmalloclist, node_, (char*)name.c_str())}; } void uda::TreeNode::udaPrintUserDefinedTypeTable(const std::string& name) @@ -204,8 +204,8 @@ uda::Scalar uda::TreeNode::atomicScalar(const std::string& target) { LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle_); NTREE* node = - findNTreeStructureComponent(logmalloclist, node_, (char*)target.c_str()); // Locate the named variable target - // NTREE * node = findNTreeStructureComponent(node_, target.c_str()); // Locate the named variable target + udaFindNTreeStructureComponent(logmalloclist, node_, (char*)target.c_str()); // Locate the named variable target + // NTREE * node = udaFindNTreeStructureComponent(node_, target.c_str()); // Locate the named variable target if (node == nullptr) { return Scalar::Null; } @@ -334,8 +334,8 @@ uda::Vector getStringVector(LOGMALLOCLIST* logmalloclist, NTREE* node, const std uda::Vector uda::TreeNode::atomicVector(const std::string& target) { LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle_); - NTREE* node = findNTreeStructureComponent(logmalloclist, node_, (char*)target.c_str()); - // NTREE * node = findNTreeStructureComponent(node_, (char *)target.c_str()); // Locate the named variable target + NTREE* node = udaFindNTreeStructureComponent(logmalloclist, node_, (char*)target.c_str()); + // NTREE * node = udaFindNTreeStructureComponent(node_, (char *)target.c_str()); // Locate the named variable target if (node == nullptr) { return Vector::Null; } @@ -449,8 +449,8 @@ static uda::Array getArray(LOGMALLOCLIST* logmalloclist, NTREE* node, const std: uda::Array uda::TreeNode::atomicArray(const std::string& target) { LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle_); - NTREE* node = findNTreeStructureComponent(logmalloclist, node_, (char*)target.c_str()); - // NTREE * node = findNTreeStructureComponent(node_, (char *)target.c_str()); // Locate the named variable target + NTREE* node = udaFindNTreeStructureComponent(logmalloclist, node_, (char*)target.c_str()); + // NTREE * node = udaFindNTreeStructureComponent(node_, (char *)target.c_str()); // Locate the named variable target if (node == nullptr) { return Array::Null; } @@ -505,7 +505,7 @@ uda::Array uda::TreeNode::atomicArray(const std::string& target) uda::StructData uda::TreeNode::structData(const std::string& target) { LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle_); - NTREE* node = findNTreeStructureComponent(logmalloclist, node_, (char*)target.c_str()); + NTREE* node = udaFindNTreeStructureComponent(logmalloclist, node_, (char*)target.c_str()); if (node == nullptr) { return StructData::Null; } diff --git a/source/wrappers/idl/idamStructs.c b/source/wrappers/idl/idamStructs.c index b34a3fb7..dd2a1898 100755 --- a/source/wrappers/idl/idamStructs.c +++ b/source/wrappers/idl/idamStructs.c @@ -97,8 +97,8 @@ IDL_VPTR IDL_CDECL findidamtreestructurecomponent(int argc, IDL_VPTR argv[], cha // 3 Args: IDAM handle (long32 int), Node address or null (0) (long64 int) and the // target structure component name (string) - // calls: NTREE *findNTreeStructureComponent(NTREE *ntree, char *target) - // or NTREE *findNTreeChildStructureComponent(NTREE *ntree, char *target) - if the children keyword is set + // calls: NTREE *udaFindNTreeStructureComponent(NTREE *ntree, char *target) + // or NTREE *udaFindNTreeChildStructureComponent(NTREE *ntree, char *target) - if the children keyword is set int handle; NTREE* ntree; @@ -180,9 +180,9 @@ IDL_VPTR IDL_CDECL findidamtreestructurecomponent(int argc, IDL_VPTR argv[], cha LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle); if (!kw.children) { - ntreeFound = (IDL_MEMINT) findNTreeStructureComponent(logmalloclist, ntree, target); + ntreeFound = (IDL_MEMINT) udaFindNTreeStructureComponent(logmalloclist, ntree, target); } else { - ntreeFound = (IDL_MEMINT) findNTreeChildStructureComponent(logmalloclist, ntree, target); + ntreeFound = (IDL_MEMINT) udaFindNTreeChildStructureComponent(logmalloclist, ntree, target); } if (kw.debug) { @@ -217,7 +217,7 @@ IDL_VPTR IDL_CDECL findidamtreestructuredefinition(int argc, IDL_VPTR argv[], ch // 3 Args: IDAM handle (long32 int), Node address or null (0) (long64 int) and the // target structure component definition name (string) - // calls: NTREE *findNTreeStructureDefinition(NTREE *ntree, char *target){ + // calls: NTREE *udaFindNTreeStructureDefinition(NTREE *ntree, char *target){ int handle; NTREE* ntree; @@ -293,7 +293,7 @@ IDL_VPTR IDL_CDECL findidamtreestructuredefinition(int argc, IDL_VPTR argv[], ch //--------------------------------------------------------------------------------------------- // Call accessor - ntreeFound = (IDL_MEMINT) findNTreeStructureDefinition(ntree, target); + ntreeFound = (IDL_MEMINT) udaFindNTreeStructureDefinition(ntree, target); if (kw.debug) { fprintf(stdout, "+++ findIdamTreeStructureDefinition +++\n"); @@ -325,8 +325,8 @@ IDL_VPTR IDL_CDECL findidamtreestructure(int argc, IDL_VPTR argv[], char* argk) // 3 Args: IDAM handle (long32 int), Node address or null (0) (long64 int) and the // target structure component name (string) - // calls: NTREE *findNTreeStructure(NTREE *ntree, char *target) - // or NTREE *findNTreeChildStructure(NTREE *ntree, char *target) + // calls: NTREE *udaFindNTreeStructure(NTREE *ntree, char *target) + // or NTREE *udaFindNTreeChildStructure(NTREE *ntree, char *target) int handle; NTREE* ntree; @@ -408,9 +408,9 @@ IDL_VPTR IDL_CDECL findidamtreestructure(int argc, IDL_VPTR argv[], char* argk) LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle); if (!kw.children) { - ntreeFound = (IDL_MEMINT) findNTreeStructure(logmalloclist, ntree, target); + ntreeFound = (IDL_MEMINT) udaFindNTreeStructure(logmalloclist, ntree, target); } else { - ntreeFound = (IDL_MEMINT) findNTreeChildStructure(logmalloclist, ntree, target); + ntreeFound = (IDL_MEMINT) udaFindNTreeChildStructure(logmalloclist, ntree, target); } if (kw.debug) { @@ -2791,7 +2791,7 @@ IDL_VPTR IDL_CDECL getidamnodestructuredatacount(int argc, IDL_VPTR argv[], char // // 2 Args: IDAM handle (long32 int), Node address or null (0) (long64 int) - // calls: int getNodeStructureDataCount(NTREE *ntree) + // calls: int udaGetNodeStructureDataCount(NTREE *ntree) int handle, count; NTREE* ntree; @@ -2859,7 +2859,7 @@ IDL_VPTR IDL_CDECL getidamnodestructuredatacount(int argc, IDL_VPTR argv[], char LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle); - count = getNodeStructureDataCount(logmalloclist, ntree); + count = udaGetNodeStructureDataCount(logmalloclist, ntree); if (kw.debug) { USERDEFINEDTYPE* udt = ntree->userdefinedtype; @@ -2882,7 +2882,7 @@ IDL_VPTR IDL_CDECL getidamnodestructuredatarank(int argc, IDL_VPTR argv[], char* // // 2 Args: IDAM handle (long32 int), Node address or null (0) (long64 int) - // calls: int getNodeStructureDataRank(NTREE *ntree) + // calls: int udaGetNodeStructureDataRank(NTREE *ntree) int handle, rank; NTREE* ntree; @@ -2950,7 +2950,7 @@ IDL_VPTR IDL_CDECL getidamnodestructuredatarank(int argc, IDL_VPTR argv[], char* LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle); - rank = getNodeStructureDataRank(logmalloclist, ntree); + rank = udaGetNodeStructureDataRank(logmalloclist, ntree); if (kw.debug) { USERDEFINEDTYPE* udt = ntree->userdefinedtype; @@ -2973,9 +2973,9 @@ IDL_VPTR IDL_CDECL getidamnodestructuredatashape(int argc, IDL_VPTR argv[], char // // 2 Args: IDAM handle (long32 int), Node address or null (0) (long64 int) - // calls: int *getNodeStructureDataShape(NTREE *ntree) - // int getNodeStructureDataRank(NTREE *ntree) - // int getNodeStructureDataCount(NTREE *ntree) + // calls: int *udaGetNodeStructureDataShape(NTREE *ntree) + // int udaGetNodeStructureDataRank(NTREE *ntree) + // int udaGetNodeStructureDataCount(NTREE *ntree) int handle, count, rank, test; NTREE* ntree; @@ -3046,14 +3046,14 @@ IDL_VPTR IDL_CDECL getidamnodestructuredatashape(int argc, IDL_VPTR argv[], char LOGMALLOCLIST* logmalloclist = udaGetLogMallocList(handle); - count = getNodeStructureDataCount(logmalloclist, ntree); - rank = getNodeStructureDataRank(logmalloclist, ntree); + count = udaGetNodeStructureDataCount(logmalloclist, ntree); + rank = udaGetNodeStructureDataRank(logmalloclist, ntree); int* shape; if (rank <= 1) { idl_shape[0] = 1; } else { - if ((shape = getNodeStructureDataShape(logmalloclist, ntree)) == NULL) { + if ((shape = udaGetNodeStructureDataShape(logmalloclist, ntree)) == NULL) { fprintf(stdout, "ERROR: Structure Component has no Shape data when expected!\n"); return (IDL_GettmpLong(0)); } @@ -4032,17 +4032,17 @@ IDL_VPTR IDL_CDECL makeidamstructure(int argc, IDL_VPTR argv[], char* argk) { IDL_VPTR IDL_CDECL getidamstructuredatasize(int argc, IDL_VPTR argv[], char* argk) { - //int getNodeStructureDataSize(NTREE *ntree) + //int udaGetNodeStructureDataSize(NTREE *ntree) return (IDL_GettmpLong(0)); } IDL_VPTR IDL_CDECL getidamstructuredatadatatype(int argc, IDL_VPTR argv[], char* argk) { - //char *getNodeStructureDataDataType(NTREE *ntree) + //char *udaGetNodeStructureDataDataType(NTREE *ntree) return (IDL_GettmpLong(0)); } IDL_VPTR IDL_CDECL getidamstructuredata(int argc, IDL_VPTR argv[], char* argk) { - //void *getNodeStructureData(NTREE *ntree) + //void *udaGetNodeStructureData(NTREE *ntree) return (IDL_GettmpLong(0)); }