Sync with latest mmi-framework

Change-Id: I5404938a40a3da216977c5f047ab44aea2895902

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
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 bee325b96ae75a5e0ec886afe2f58963fff39c1a..c3540d06df700309e21a0ef4e4e10488e5f94f1e 100644 (file)
--- a/src/mmi/mmi-signal.cpp
+++ b/src/mmi/mmi-signal.cpp
@@ -21,6 +21,8 @@
 
 #include "mmi-log.h"
 
+#include <stdio.h>
+
 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 (executable)
new mode 100644 (file)

diff --git a/src/mmi/mmi-workflow-script-generator.h b/src/mmi/mmi-workflow-script-generator.h
old mode 100755 (executable)
new mode 100644 (file)