pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41910?usp=email )

Change subject: osmo_io: Reorder iofd_handle_segmented_read() ......................................................................

osmo_io: Reorder iofd_handle_segmented_read()

All other similar functions have first the int rc and later the struct msgb; fix this one being different.

Change-Id: I88683334e77901776c806dad776ef46ea20b4480 --- M src/core/osmo_io.c M src/core/osmo_io_internal.h 2 files changed, 3 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/41910/1

diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 1a55ff1..d6cd57f 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -359,7 +359,7 @@

/*! Restore message boundaries on read() and pass individual messages to the read callback */ -void iofd_handle_segmented_read(struct osmo_io_fd *iofd, struct msgb *msg, int rc) +void iofd_handle_segmented_read(struct osmo_io_fd *iofd, int rc, struct msgb *msg) { int res; struct msgb *pending; @@ -425,7 +425,7 @@ { switch (iofd->mode) { case OSMO_IO_FD_MODE_READ_WRITE: - iofd_handle_segmented_read(iofd, msg, rc); + iofd_handle_segmented_read(iofd, rc, msg); break; case OSMO_IO_FD_MODE_RECVFROM_SENDTO: talloc_steal(iofd->msgb_alloc.ctx, msg); diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index f425da2..781ae64 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -189,7 +189,7 @@

void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *msghdr); void iofd_handle_send_completion(struct osmo_io_fd *iofd, int rc, struct iofd_msghdr *msghdr); -void iofd_handle_segmented_read(struct osmo_io_fd *iofd, struct msgb *msg, int rc); +void iofd_handle_segmented_read(struct osmo_io_fd *iofd, int rc, struct msgb *msg);

int iofd_txqueue_enqueue(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr); void iofd_txqueue_enqueue_front(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr);