From 75bdf8ccd838caf0e7d66e38dc0b9946bd61466e Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Thu, 4 Apr 2024 19:36:34 +0900 Subject: [PATCH] Sync with latest mmi-framework Change-Id: I5404938a40a3da216977c5f047ab44aea2895902 --- .gitignore | 1 + src/mmi/mmi-signal.cpp | 11 +++++------ src/mmi/mmi-workflow-script-common.h | 0 src/mmi/mmi-workflow-script-generator.h | 0 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 .gitignore mode change 100755 => 100644 src/mmi/mmi-workflow-script-common.h mode change 100755 => 100644 src/mmi/mmi-workflow-script-generator.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..77f12ae --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +docs/ diff --git a/src/mmi/mmi-signal.cpp b/src/mmi/mmi-signal.cpp index bee325b..c3540d0 100644 --- a/src/mmi/mmi-signal.cpp +++ b/src/mmi/mmi-signal.cpp @@ -21,6 +21,8 @@ #include "mmi-log.h" +#include + MMI_API int mmi_signal_parameter_create(mmi_primitive_value_h value, const char *name, mmi_signal_parameter_h *signal_parameter) { if (signal_parameter == NULL) { return MMI_ERROR_INVALID_PARAMETER; @@ -35,8 +37,7 @@ MMI_API int mmi_signal_parameter_create(mmi_primitive_value_h value, const char *signal_parameter = (mmi_signal_parameter_s*)calloc(1, sizeof(mmi_signal_parameter_s)); if (*signal_parameter == NULL) return MMI_ERROR_OUT_OF_MEMORY; - strncpy((*signal_parameter)->name, name, MMI_NAME_MAX_LENGTH - 1); - (*signal_parameter)->name[MMI_NAME_MAX_LENGTH - 1] = '\0'; + snprintf((*signal_parameter)->name, MMI_NAME_MAX_LENGTH, "%s", name); mmi_primitive_value_clone(value, &((*signal_parameter)->value)); return MMI_ERROR_NONE; @@ -66,8 +67,7 @@ MMI_API int mmi_signal_parameter_clone(mmi_signal_parameter_h signal_parameter, *cloned = (mmi_signal_parameter_s*)calloc(1, sizeof(mmi_signal_parameter_s)); if (*cloned == NULL) return MMI_ERROR_OUT_OF_MEMORY; - strncpy((*cloned)->name, signal_parameter->name, MMI_NAME_MAX_LENGTH - 1); - (*cloned)->name[MMI_NAME_MAX_LENGTH - 1] = '\0'; + snprintf((*cloned)->name, MMI_NAME_MAX_LENGTH, "%s", signal_parameter->name); mmi_primitive_value_clone(signal_parameter->value, &((*cloned)->value)); return MMI_ERROR_NONE; @@ -96,8 +96,7 @@ MMI_API int mmi_signal_create(const char *name, mmi_signal_h *handle) { *handle = (mmi_signal_s*)calloc(1, sizeof(mmi_signal_s)); if (*handle == NULL) return MMI_ERROR_OUT_OF_MEMORY; - strncpy((*handle)->name, name, MMI_NAME_MAX_LENGTH - 1); - (*handle)->name[MMI_NAME_MAX_LENGTH - 1] = '\0'; + snprintf((*handle)->name, MMI_NAME_MAX_LENGTH, "%s", name); return MMI_ERROR_NONE; } diff --git a/src/mmi/mmi-workflow-script-common.h b/src/mmi/mmi-workflow-script-common.h old mode 100755 new mode 100644 diff --git a/src/mmi/mmi-workflow-script-generator.h b/src/mmi/mmi-workflow-script-generator.h old mode 100755 new mode 100644 -- 2.34.1