summaryrefslogtreecommitdiffstats
path: root/src/shared/libosmocore/src/write_queue.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared/libosmocore/src/write_queue.c')
-rw-r--r--src/shared/libosmocore/src/write_queue.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/shared/libosmocore/src/write_queue.c b/src/shared/libosmocore/src/write_queue.c
index 618a8c0b..0642aad6 100644
--- a/src/shared/libosmocore/src/write_queue.c
+++ b/src/shared/libosmocore/src/write_queue.c
@@ -21,7 +21,7 @@
*
*/
-#include <osmocore/write_queue.h>
+#include <osmocom/core/write_queue.h>
int write_queue_bfd_cb(struct bsc_fd *fd, unsigned int what)
{
@@ -39,16 +39,18 @@ int write_queue_bfd_cb(struct bsc_fd *fd, unsigned int what)
struct msgb *msg;
fd->when &= ~BSC_FD_WRITE;
- msg = msgb_dequeue(&queue->msg_queue);
- if (!msg)
- return -1;
- --queue->current_length;
- queue->write_cb(fd, msg);
- msgb_free(msg);
+ /* the queue might have been emptied */
+ if (!llist_empty(&queue->msg_queue)) {
+ --queue->current_length;
+
+ msg = msgb_dequeue(&queue->msg_queue);
+ queue->write_cb(fd, msg);
+ msgb_free(msg);
- if (!llist_empty(&queue->msg_queue))
- fd->when |= BSC_FD_WRITE;
+ if (!llist_empty(&queue->msg_queue))
+ fd->when |= BSC_FD_WRITE;
+ }
}
return 0;