aboutsummaryrefslogtreecommitdiffstats
path: root/samsung-ipc/net.c
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2013-06-25 22:18:41 +0200
committerPaul Kocialkowski <contact@paulk.fr>2013-06-25 22:18:41 +0200
commitc9dfae7a17ea4e5a2e114df331942f70d48bfe5b (patch)
treeecb078dd2e97ec1f2d56ae99da54f6d3028015d1 /samsung-ipc/net.c
parent0e0c698a13ae658640af085591b809bbc9a6f658 (diff)
downloadexternal_libsamsung-ipc-c9dfae7a17ea4e5a2e114df331942f70d48bfe5b.zip
external_libsamsung-ipc-c9dfae7a17ea4e5a2e114df331942f70d48bfe5b.tar.gz
external_libsamsung-ipc-c9dfae7a17ea4e5a2e114df331942f70d48bfe5b.tar.bz2
Refactor code for consistent coding style and avoid using assert
Change-Id: Idca5edb70869e07d35744301b185df02e42f5b4c Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'samsung-ipc/net.c')
-rw-r--r--samsung-ipc/net.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/samsung-ipc/net.c b/samsung-ipc/net.c
index 8e1df03..7164565 100644
--- a/samsung-ipc/net.c
+++ b/samsung-ipc/net.c
@@ -1,4 +1,4 @@
-/**
+/*
* This file is part of libsamsung-ipc.
*
* Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com
@@ -18,7 +18,9 @@
*
*/
+#include <stdlib.h>
#include <string.h>
+
#include <samsung-ipc.h>
void ipc_net_regist_get_setup(struct ipc_net_regist_get *message, unsigned char domain)
@@ -30,10 +32,15 @@ void ipc_net_regist_get_setup(struct ipc_net_regist_get *message, unsigned char
void ipc_net_plmn_sel_set_setup(struct ipc_net_plmn_sel_set *message, unsigned char mode, char *plmn, unsigned char act)
{
- int message_plmn_len = sizeof(message->plmn) / sizeof(char);
+ int message_plmn_len;
int plmn_len;
int i;
+ if (message == NULL)
+ return;
+
+ message_plmn_len = sizeof(message->plmn);
+
memset(message, 0, sizeof(struct ipc_net_plmn_sel_set));
if (mode == IPC_NET_PLMN_SEL_AUTO)
@@ -53,7 +60,7 @@ void ipc_net_plmn_sel_set_setup(struct ipc_net_plmn_sel_set *message, unsigned c
// If there are less (5 is the usual case) PLMN bytes, fill the rest with '#'
if (plmn_len < message_plmn_len)
- memset((void*) (message->plmn + plmn_len), '#', message_plmn_len - plmn_len);
+ memset((void *) (message->plmn + plmn_len), '#', message_plmn_len - plmn_len);
message->mode = IPC_NET_PLMN_SEL_MANUAL;
message->act = act;