sms_queue: merge sms_pending_add into sms_pending_from
Both callers would immediately execute sms_pending_add() after
a successful sms_pending_from(); we can merge those two functions.
Change-Id: Iaf37234b3caafd568dd4fe17739be9ec842c2a8d
diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c
index 461b3af..d10c879 100644
--- a/src/libmsc/sms_queue.c
+++ b/src/libmsc/sms_queue.c
@@ -203,15 +203,12 @@
vlr_subscr_get(sms->receiver, VSUB_USE_SMS_PENDING);
pending->vsub = sms->receiver;
pending->sms_id = sms->id;
- return pending;
-}
+ llist_add_tail(&pending->entry, &smsq->pending_sms);
-/* add (append) a gsm_sms_pending to the queue pending_sms list */
-static void sms_pending_add(struct gsm_sms_queue *smsq, struct gsm_sms_pending *pending)
-{
smsq->pending += 1;
smsq_stat_item_inc(smsq, SMSQ_STAT_SMS_RAM_PENDING);
- llist_add_tail(&pending->entry, &smsq->pending_sms);
+
+ return pending;
}
/* release a gsm_sms_pending object */
@@ -413,7 +410,6 @@
}
attempted += 1;
- sms_pending_add(smsq, pending);
_gsm411_send_sms(smsq->network, sms->receiver, sms);
} while (attempted < attempts && rounds < 1000);
@@ -451,7 +447,6 @@
goto no_pending_sms;
}
- sms_pending_add(smsq, pending);
_gsm411_send_sms(smsq->network, sms->receiver, sms);
return;