From 1688699c3f1272335132c9113bfd2337b39279af Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 20 Mar 2019 10:26:39 +0100 Subject: select: Rename BSC_FD_* constants to OSMO_FD_* The naming of these constants dates back to when the code was private within OpenBSC. Everything else was renamed (bsc_fd -> osmo_fd) at the time, but somehow the BSC_FD_* defines have been missed at the time. Keep compatibility #defines around, but allow us to migrate the applications to a less confusing naming meanwhile. Change-Id: Ifae33ed61a7cf0ae54ad487399e7dd2489986436 --- src/write_queue.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/write_queue.c') diff --git a/src/write_queue.c b/src/write_queue.c index fb6839a2..3399b0f1 100644 --- a/src/write_queue.c +++ b/src/write_queue.c @@ -47,22 +47,22 @@ int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what) queue = container_of(fd, struct osmo_wqueue, bfd); - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { rc = queue->read_cb(fd); if (rc == -EBADF) goto err_badfd; } - if (what & BSC_FD_EXCEPT) { + if (what & OSMO_FD_EXCEPT) { rc = queue->except_cb(fd); if (rc == -EBADF) goto err_badfd; } - if (what & BSC_FD_WRITE) { + if (what & OSMO_FD_WRITE) { struct msgb *msg; - fd->when &= ~BSC_FD_WRITE; + fd->when &= ~OSMO_FD_WRITE; /* the queue might have been emptied */ if (!llist_empty(&queue->msg_queue)) { @@ -76,7 +76,7 @@ int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what) goto err_badfd; if (!llist_empty(&queue->msg_queue)) - fd->when |= BSC_FD_WRITE; + fd->when |= OSMO_FD_WRITE; } } @@ -115,7 +115,7 @@ int osmo_wqueue_enqueue(struct osmo_wqueue *queue, struct msgb *data) ++queue->current_length; msgb_enqueue(&queue->msg_queue, data); - queue->bfd.when |= BSC_FD_WRITE; + queue->bfd.when |= OSMO_FD_WRITE; return 0; } @@ -133,7 +133,7 @@ void osmo_wqueue_clear(struct osmo_wqueue *queue) } queue->current_length = 0; - queue->bfd.when &= ~BSC_FD_WRITE; + queue->bfd.when &= ~OSMO_FD_WRITE; } /*! @} */ -- cgit v1.2.3