aboutsummaryrefslogtreecommitdiffstats
path: root/samsung-ipc/sms.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/sms.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/sms.c')
-rw-r--r--samsung-ipc/sms.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/samsung-ipc/sms.c b/samsung-ipc/sms.c
index a4c7855..8b91987 100644
--- a/samsung-ipc/sms.c
+++ b/samsung-ipc/sms.c
@@ -1,4 +1,4 @@
-/**
+/*
* This file is part of libsamsung-ipc.
*
* Copyright (C) 2011 Simon Busch <morphis@gravedo.de>
@@ -18,28 +18,29 @@
*
*/
-#include <samsung-ipc.h>
+#include <stdlib.h>
#include <string.h>
-#include <assert.h>
-unsigned char* ipc_sms_send_msg_pack(struct ipc_sms_send_msg_request *msg, char *smsc,
+#include <samsung-ipc.h>
+
+unsigned char *ipc_sms_send_msg_pack(struct ipc_sms_send_msg_request *msg, char *smsc,
unsigned char *pdu, int pdu_length)
{
unsigned char *data = NULL, *p = NULL;
unsigned int data_length = 0, smsc_len = 0;
- assert(smsc != NULL);
- assert(pdu != NULL);
+ if (msg == NULL || smsc == NULL || pdu == NULL)
+ return NULL;
smsc_len = strlen(smsc);
data_length = smsc_len + pdu_length + sizeof(struct ipc_sms_send_msg_request);
- data = (unsigned char*) malloc(sizeof(unsigned char) * data_length);
+ data = (unsigned char *) malloc(sizeof(unsigned char) * data_length);
memset(data, 0, data_length);
p = data;
memcpy(p, msg, sizeof(struct ipc_sms_send_msg_request));
p += sizeof(struct ipc_sms_send_msg_request);
- memcpy(p, (char*) (smsc + 1), smsc_len);
+ memcpy(p, (char *) (smsc + 1), smsc_len);
p += smsc_len;
memcpy(p, pdu, pdu_length);