Change in osmo-msc[master]: sms_queue: merge sms_pending_add into sms_pending_from

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28119 ) Change subject: sms_queue: merge sms_pending_add into sms_pending_from ...................................................................... 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 --- M src/libmsc/sms_queue.c 1 file changed, 3 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve 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; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iaf37234b3caafd568dd4fe17739be9ec842c2a8d Gerrit-Change-Number: 28119 Gerrit-PatchSet: 4 Gerrit-Owner: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-MessageType: merged