@ -41,11 +41,13 @@ int buf_free (circbuf_t * buf)
int buf_pop ( circbuf_t * buf , char * dest , unsigned int len )
int buf_pop ( circbuf_t * buf , char * dest , unsigned int len )
{
{
unsigned int i ;
unsigned int i ;
char * p = buf - > top ;
char * p ;
assert ( buf ! = NULL ) ;
assert ( buf ! = NULL ) ;
assert ( dest ! = NULL ) ;
assert ( dest ! = NULL ) ;
p = buf - > top ;
/* Cap to number of bytes in buffer */
/* Cap to number of bytes in buffer */
if ( len > buf - > size )
if ( len > buf - > size )
len = buf - > size ;
len = buf - > size ;
@ -69,11 +71,13 @@ int buf_push (circbuf_t * buf, const char *src, unsigned int len)
{
{
/* NOTE: this function allows push to overwrite old data. */
/* NOTE: this function allows push to overwrite old data. */
unsigned int i ;
unsigned int i ;
char * p = buf - > tail ;
char * p ;
assert ( buf ! = NULL ) ;
assert ( buf ! = NULL ) ;
assert ( src ! = NULL ) ;
assert ( src ! = NULL ) ;
p = buf - > tail ;
for ( i = 0 ; i < len ; i + + ) {
for ( i = 0 ; i < len ; i + + ) {
* p + + = src [ i ] ;
* p + + = src [ i ] ;
if ( p = = buf - > end ) {
if ( p = = buf - > end ) {