- replaced strndup

pull/72/head
Michael Zillgith 7 years ago
parent 51c29fe9a7
commit 77f97dc006

@ -1,17 +1,17 @@
set(iec61850_client_array_SRCS set(iec61850_client_example_array_SRCS
client_example_array.c client_example_array.c
) )
IF(WIN32) IF(WIN32)
set_source_files_properties(${iec61850_client_array_SRCS} set_source_files_properties(${iec61850_client_example_array_SRCS}
PROPERTIES LANGUAGE CXX) PROPERTIES LANGUAGE CXX)
ENDIF(WIN32) ENDIF(WIN32)
add_executable(iec61850_client_array add_executable(iec61850_client_example_array
${iec61850_client_array_SRCS} ${iec61850_client_example_array_SRCS}
) )
target_link_libraries(iec61850_client_array target_link_libraries(iec61850_client_example_array
iec61850 iec61850
) )

@ -472,7 +472,7 @@ createAlternateAccessComponent(const char* componentName)
alternateAccess->list.array[0]->choice.unnamed = (AlternateAccessSelection_t*) GLOBAL_CALLOC(1, sizeof(AlternateAccessSelection_t)); alternateAccess->list.array[0]->choice.unnamed = (AlternateAccessSelection_t*) GLOBAL_CALLOC(1, sizeof(AlternateAccessSelection_t));
char* separator = strchr(componentName, '$'); const char* separator = strchr(componentName, '$');
if (separator) { if (separator) {
int size = separator - componentName; int size = separator - componentName;
@ -481,7 +481,8 @@ createAlternateAccessComponent(const char* componentName)
alternateAccess->list.array[0]->choice.unnamed->choice.selectAlternateAccess.accessSelection.present = alternateAccess->list.array[0]->choice.unnamed->choice.selectAlternateAccess.accessSelection.present =
AlternateAccessSelection__selectAlternateAccess__accessSelection_PR_component; AlternateAccessSelection__selectAlternateAccess__accessSelection_PR_component;
alternateAccess->list.array[0]->choice.unnamed->choice.selectAlternateAccess.accessSelection.choice.component.buf = (uint8_t*) strndup(componentName, size); alternateAccess->list.array[0]->choice.unnamed->choice.selectAlternateAccess.accessSelection.choice.component.buf =
(uint8_t*) StringUtils_copySubString((char*) componentName, (char*) separator);
alternateAccess->list.array[0]->choice.unnamed->choice.selectAlternateAccess.accessSelection.choice.component.size = size; alternateAccess->list.array[0]->choice.unnamed->choice.selectAlternateAccess.accessSelection.choice.component.size = size;
alternateAccess->list.array[0]->choice.unnamed->choice.selectAlternateAccess.alternateAccess = createAlternateAccessComponent(separator + 1); alternateAccess->list.array[0]->choice.unnamed->choice.selectAlternateAccess.alternateAccess = createAlternateAccessComponent(separator + 1);
@ -494,7 +495,8 @@ createAlternateAccessComponent(const char* componentName)
alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.present = alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.present =
AlternateAccessSelection__selectAccess_PR_component; AlternateAccessSelection__selectAccess_PR_component;
alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.choice.component.buf = (uint8_t*) strndup(componentName, size); alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.choice.component.buf =
(uint8_t*) StringUtils_copyString(componentName);
alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.choice.component.size = size; alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.choice.component.size = size;
} }

Loading…
Cancel
Save