updates.

[silc.git] / lib / silcutil / silcbufutil.h

diff --git a/lib/silcutil/silcbufutil.h b/lib/silcutil/silcbufutil.h
index 1525375deb51371c6858258eee9628de74510396..ecf99e03c978ccd21e7c460342af912fca78bef2 100644 (file)
--- a/lib/silcutil/silcbufutil.h
+++ b/lib/silcutil/silcbufutil.h
@@ -21,13 +21,12 @@
 #ifndef SILCBUFUTIL_H
 #define SILCBUFUTIL_H
 
-#ifndef SILC_DEBUG             /* When we are not doing debugging we use
-                                  optimized inline buffer functions. */
+#include "silcbuffer.h"
 
 /* Clears and initialiazes the buffer to the state as if it was just
    allocated by silc_buffer_alloc. */
 
-extern inline
+static inline
 void silc_buffer_clear(SilcBuffer sb)
 {
   memset(sb->head, 0, sb->truelen);
@@ -40,7 +39,7 @@ void silc_buffer_clear(SilcBuffer sb)
    currently valid data area, nothing more. Use silc_buffer_clone to
    copy entire buffer. */
 
-extern inline
+static inline
 SilcBuffer silc_buffer_copy(SilcBuffer sb)
 {
   SilcBuffer sb_new;
@@ -56,7 +55,7 @@ SilcBuffer silc_buffer_copy(SilcBuffer sb)
    everything from the source buffer. The result is exact clone of
    the original buffer. */
 
-extern inline
+static inline
 SilcBuffer silc_buffer_clone(SilcBuffer sb)
 {
   SilcBuffer sb_new;
@@ -75,11 +74,17 @@ SilcBuffer silc_buffer_clone(SilcBuffer sb)
    new SilcBuffer pointer. The buffer is exact clone of the old one
    except that there is now more space at the end of buffer. */
 
-extern inline
-SilcBuffer silc_buffer_realloc(SilcBuffer sb, unsigned int newsize)
+static inline
+SilcBuffer silc_buffer_realloc(SilcBuffer sb, uint32 newsize)
 {
   SilcBuffer sb_new;
 
+  if (!sb)
+    return silc_buffer_alloc(newsize);
+
+  if (newsize <= sb->truelen)
+    return sb;
+
   sb_new = silc_buffer_alloc(newsize);
   silc_buffer_pull_tail(sb_new, SILC_BUFFER_END(sb_new));
   silc_buffer_put(sb_new, sb->head, sb->truelen);
@@ -92,14 +97,4 @@ SilcBuffer silc_buffer_realloc(SilcBuffer sb, unsigned int newsize)
   return sb_new;
 }
 
-#endif /* !SILC_DEBUG */
-
-/* Prototypes */
-#ifdef SILC_DEBUG
-void silc_buffer_clear(SilcBuffer sb);
-SilcBuffer silc_buffer_copy(SilcBuffer sb);
-SilcBuffer silc_buffer_clone(SilcBuffer sb);
-SilcBuffer silc_buffer_realloc(SilcBuffer sb, unsigned int newsize);
-#endif
-
 #endif