Change-Id: I9359d176db928d7c3eaf06d47f278e7b6c5a1b5d
Signed-off-by: Yu jiung <jiung.yu@samsung.com>
Name: libug-setting-wifidirect-efl
Summary: Wi-Fi Direct setting UI gadget
Name: libug-setting-wifidirect-efl
Summary: Wi-Fi Direct setting UI gadget
Release: 1
Group: App/Network
License: Flora-1.1
Release: 1
Group: App/Network
License: Flora-1.1
char msg1[WFD_POP_STR_MAX_LEN] = {0};
char msg2[WFD_POP_STR_MAX_LEN] = {0};
char msg1[WFD_POP_STR_MAX_LEN] = {0};
char msg2[WFD_POP_STR_MAX_LEN] = {0};
+ char label_str[WFD_POP_STR_MAX_LEN] = {0, };
Evas_Object *label = (Evas_Object*) data;
wfd_appdata_t *ad = wfd_get_appdata();
Evas_Object *label = (Evas_Object*) data;
wfd_appdata_t *ad = wfd_get_appdata();
_("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
connection->peer_name, keypad_popup_timeout);
_("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
connection->peer_name, keypad_popup_timeout);
snprintf(msg2, sizeof(msg2), _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
connection->peer_name);
snprintf(msg2, sizeof(msg2), _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
connection->peer_name);
- strcat(msg1, msg2);
- elm_object_domain_translatable_text_set(label, PACKAGE, msg1);
+ snprintf(label_str, sizeof(label_str), "%s %s", msg1, msg2);
+ elm_object_domain_translatable_text_set(label, PACKAGE, label_str);
WFD_APP_LOG(WFD_APP_LOG_LOW, "wfd_rename desc\n");
char msg1[WFD_POP_STR_MAX_LEN] = {0, };
char msg2[WFD_POP_STR_MAX_LEN] = {0, };
WFD_APP_LOG(WFD_APP_LOG_LOW, "wfd_rename desc\n");
char msg1[WFD_POP_STR_MAX_LEN] = {0, };
char msg2[WFD_POP_STR_MAX_LEN] = {0, };
+ char label_str[WFD_POP_STR_MAX_LEN] = {0, };
wfd_appdata_t *ad = wfd_get_appdata();
WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n");
wfd_connection_info_s *connection = ad->connection;
wfd_appdata_t *ad = wfd_get_appdata();
WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n");
wfd_connection_info_s *connection = ad->connection;
_("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
connection->peer_name, ad->timeout);
_("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
connection->peer_name, ad->timeout);
snprintf(msg2, sizeof(msg2),
_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
connection->peer_name);
snprintf(msg2, sizeof(msg2),
_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
connection->peer_name);
- strcat(msg1, msg2);
- WFD_APP_LOG(WFD_APP_LOG_LOW, "string %s", msg1);
+ snprintf(label_str, sizeof(label_str), "%s %s", msg1, msg2);
+ WFD_APP_LOG(WFD_APP_LOG_LOW, "string %s", label_str);
__WFD_APP_FUNC_EXIT__;
return g_strdup(msg1);
}
__WFD_APP_FUNC_EXIT__;
return g_strdup(msg1);
}
#define VCONF_WFD_APNAME "db/setting/device_name"
#define VCONF_WFD_APNAME "db/setting/device_name"
+#define MAX_HEX_COLOR_LENGTH 255
+
#define assertm_if(expr, fmt, arg...) do { \
if (expr) { \
DBG(LOG_VERBOSE, " ##(%s) -> %s() assert!!## "fmt, #expr, __FUNCTION__, ##arg); \
#define assertm_if(expr, fmt, arg...) do { \
if (expr) { \
DBG(LOG_VERBOSE, " ##(%s) -> %s() assert!!## "fmt, #expr, __FUNCTION__, ##arg); \
{
int hexcolor = 0;
char *string = NULL;
{
int hexcolor = 0;
char *string = NULL;
- string = g_try_malloc0(sizeof(char )* 255);
+ string = g_try_malloc0(MAX_HEX_COLOR_LENGTH);
if (string == NULL) {
return string;
}
hexcolor = (r << 24) + (g << 16) + (b << 8) + a;
if (string == NULL) {
return string;
}
hexcolor = (r << 24) + (g << 16) + (b << 8) + a;
- sprintf(string, "%08x", hexcolor );
+ snprintf(string, MAX_HEX_COLOR_LENGTH, "%08x", hexcolor );
for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
if(!strncmp(peer_start->mac_addr, peer->mac_addr, MAC_LENGTH)) {
DBG(LOG_INFO, "Device [%s] found in genlist, but it is already lost", ((device_type_s *)iterator->data)->ssid);
for (iterator = ugd->raw_discovered_peer_list; iterator; iterator = iterator->next) {
if(!strncmp(peer_start->mac_addr, peer->mac_addr, MAC_LENGTH)) {
DBG(LOG_INFO, "Device [%s] found in genlist, but it is already lost", ((device_type_s *)iterator->data)->ssid);
- sprintf(txt, "Cannot find device %s", ((device_type_s *)iterator->data)->ssid);
+ snprintf(txt, sizeof(txt), "Cannot find device %s", ((device_type_s *)iterator->data)->ssid);
free_gl_peer(&ugd->gl_avlb_peers_start, ((device_type_s *)iterator->data)->mac_addr, &ugd->gl_available_peer_cnt);
wfd_check_gl_available_peers(ugd);
wfd_ug_warn_popup(ugd, txt, POPUP_TYPE_INFO);
free_gl_peer(&ugd->gl_avlb_peers_start, ((device_type_s *)iterator->data)->mac_addr, &ugd->gl_available_peer_cnt);
wfd_check_gl_available_peers(ugd);
wfd_ug_warn_popup(ugd, txt, POPUP_TYPE_INFO);