From d7ef4babbb49fcfa487d950acc259916e40c35e1 Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Mon, 25 Feb 2008 20:28:10 +0000 Subject: [PATCH] The api was wrong for some functions. Remove some null checking to be able to catch bugs. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24126 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../drivers/bluetooth/h2/h2generic/snet_buffer.c | 12 ++++++------ .../drivers/bluetooth/h2/h2generic/snet_buffer.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.c b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.c index 5086994ac0..0bd1ab886e 100644 --- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.c +++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.c @@ -124,26 +124,26 @@ snb_set_cookie(snet_buffer* snb, void* cookie) /* Return true if we canot "put" more data in the buffer */ inline bool snb_completed(snet_buffer* snb) { - return (snb != NULL && (snb->expectedSize == snb->puttingSize)); + return (snb->expectedSize == snb->puttingSize); } /* Return true if we cannot pull more more data from the buffer */ inline bool snb_finished(snet_buffer* snb) { - return (snb != NULL && (snb->expectedSize == snb->pullingSize)); + return (snb->expectedSize == snb->pullingSize); } -inline bool snb_remaining_to_put(snet_buffer* snb) +inline uint16 snb_remaining_to_put(snet_buffer* snb) { - return (snb != NULL && (snb->expectedSize - snb->puttingSize)); + return (snb->expectedSize - snb->puttingSize); } -inline bool snb_remaining_to_pull(snet_buffer* snb) +inline uint16 snb_remaining_to_pull(snet_buffer* snb) { - return (snb != NULL && (snb->expectedSize - snb->pullingSize)); + return (snb->expectedSize - snb->pullingSize); } diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.h b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.h index 75c69278c2..f32458de24 100644 --- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.h +++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.h @@ -60,9 +60,9 @@ bool snb_completed(snet_buffer* snb); /* Return true if we cannot pull more more data from the buffer */ bool snb_finished(snet_buffer* snb); /* Return the amount of data we can still put in the buffer */ -bool snb_remaining_to_put(snet_buffer* snb); +uint16 snb_remaining_to_put(snet_buffer* snb); /* Return the amount of data we can still pull in the buffer */ -bool snb_remaining_to_pull(snet_buffer* snb); +uint16 snb_remaining_to_pull(snet_buffer* snb); /* These to functions are provided to avoid memory fragmentation * allocating and freeing many snb_buffers and its possible overhead.