[ds6-devel] nc6/src circ_buf.c,1.11,1.12 circ_buf.h,1.10,1.11

[chris@deepspace6.net]

Update of /cvs/nc6/src

Modified Files:
	circ_buf.c circ_buf.h 
Log Message:
Realised I named cb_size badly - it should be cb_used and cb_size should be
the total buffer size.


Index: circ_buf.c
===================================================================
RCS file: /cvs/nc6/src/circ_buf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- circ_buf.c	27 Dec 2002 22:58:32 -0000	1.11
+++ circ_buf.c	28 Dec 2002 18:41:48 -0000	1.12
@@ -298,8 +298,8 @@
 	if (cb_is_empty(cb)) return 0;
 	
 	/* set nbytes appropriately */
-	if (nbytes == 0 || nbytes > cb_size(cb))
-		nbytes = cb_size(cb);
+	if (nbytes == 0 || nbytes > cb_used(cb))
+		nbytes = cb_used(cb);
 
 	/* prepare for reading from buffer */
 	if (cb->ptr + cb->data_size > cb->buf + cb->buf_size) {
@@ -366,8 +366,8 @@
 	if (cb_is_empty(cb)) return 0;
 	
 	/* set nbytes appropriately */
-	if (nbytes == 0 || nbytes > cb_size(cb))
-		nbytes = cb_size(cb);
+	if (nbytes == 0 || nbytes > cb_used(cb))
+		nbytes = cb_used(cb);
 	
 	/* prepare for reading from buffer */
 	if (cb->ptr + cb->data_size > cb->buf + cb->buf_size) {
Index: circ_buf.h
===================================================================
RCS file: /cvs/nc6/src/circ_buf.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- circ_buf.h	27 Dec 2002 22:58:32 -0000	1.10
+++ circ_buf.h	28 Dec 2002 18:41:48 -0000	1.11
@@ -41,7 +41,8 @@
 void cb_init(circ_buf *cb, size_t size);
 void cb_destroy(circ_buf *cb);
 
-#define cb_size(CB)	((CB)->data_size)
+#define cb_size(CB)	((CB)->buf_size)
+#define cb_used(CB)	((CB)->data_size)
 #define cb_space(CB)	((CB)->buf_size - (CB)->data_size)
 
 #define cb_is_empty(CB)	(cb_size(CB) == 0)