Symbian compilation fixes.

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

diff --git a/lib/silcutil/silcbuffer.h b/lib/silcutil/silcbuffer.h
index 5356b3b2485a6bfc298493120dfac3a379adae1a..673c4a7ff0608da0bd421c4f42be134060c5c313 100644 (file)
--- a/lib/silcutil/silcbuffer.h
+++ b/lib/silcutil/silcbuffer.h
@@ -241,13 +241,13 @@ SilcBuffer silc_buffer_alloc(SilcUInt32 len)
 
   /* Allocate new SilcBuffer */
   sb = (SilcBuffer)silc_calloc(1, sizeof(*sb));
-  if (!sb)
+  if (silc_unlikely(!sb))
     return NULL;
 
-  if (len) {
+  if (silc_likely(len)) {
     /* Allocate the actual data area */
     sb->head = (unsigned char *)silc_calloc(len, sizeof(*sb->head));
-    if (!sb->head)
+    if (silc_unlikely(!sb->head))
       return NULL;
 
     /* Set pointers to the new buffer */
@@ -409,9 +409,9 @@ unsigned char *silc_buffer_pull(SilcBuffer sb, SilcUInt32 len)
 {
   unsigned char *old_data = sb->data;
 #if defined(SILC_DEBUG)
-  assert(len <= silc_buffer_len(sb));
+  SILC_ASSERT(len <= silc_buffer_len(sb));
 #else
-  if (len > silc_buffer_len(sb))
+  if (silc_unlikely(len > silc_buffer_len(sb)))
     return NULL;
 #endif
   sb->data += len;
@@ -453,9 +453,9 @@ unsigned char *silc_buffer_push(SilcBuffer sb, SilcUInt32 len)
 {
   unsigned char *old_data = sb->data;
 #if defined(SILC_DEBUG)
-  assert((sb->data - len) >= sb->head);
+  SILC_ASSERT((sb->data - len) >= sb->head);
 #else
-  if ((sb->data - len) < sb->head)
+  if (silc_unlikely((sb->data - len) < sb->head))
     return NULL;
 #endif
   sb->data -= len;
@@ -497,9 +497,9 @@ unsigned char *silc_buffer_pull_tail(SilcBuffer sb, SilcUInt32 len)
 {
   unsigned char *old_tail = sb->tail;
 #if defined(SILC_DEBUG)
-  assert(len <= silc_buffer_taillen(sb));
+  SILC_ASSERT(len <= silc_buffer_taillen(sb));
 #else
-  if (len > silc_buffer_taillen(sb))
+  if (silc_unlikely(len > silc_buffer_taillen(sb)))
     return NULL;
 #endif
   sb->tail += len;
@@ -541,9 +541,9 @@ unsigned char *silc_buffer_push_tail(SilcBuffer sb, SilcUInt32 len)
 {
   unsigned char *old_tail = sb->tail;
 #if defined(SILC_DEBUG)
-  assert((sb->tail - len) >= sb->data);
+  SILC_ASSERT((sb->tail - len) >= sb->data);
 #else
-  if ((sb->tail - len) < sb->data)
+  if (silc_unlikely((sb->tail - len) < sb->data))
     return NULL;
 #endif
   sb->tail -= len;
@@ -582,9 +582,9 @@ unsigned char *silc_buffer_put_head(SilcBuffer sb,
                                    SilcUInt32 len)
 {
 #if defined(SILC_DEBUG)
-  assert(len <= silc_buffer_headlen(sb));
+  SILC_ASSERT(len <= silc_buffer_headlen(sb));
 #else
-  if (len > silc_buffer_headlen(sb))
+  if (silc_unlikely(len > silc_buffer_headlen(sb)))
     return NULL;
 #endif
   return (unsigned char *)memcpy(sb->head, data, len);
@@ -622,9 +622,9 @@ unsigned char *silc_buffer_put(SilcBuffer sb,
                               SilcUInt32 len)
 {
 #if defined(SILC_DEBUG)
-  assert(len <= silc_buffer_len(sb));
+  SILC_ASSERT(len <= silc_buffer_len(sb));
 #else
-  if (len > silc_buffer_len(sb))
+  if (silc_unlikely(len > silc_buffer_len(sb)))
     return NULL;
 #endif
   return (unsigned char *)memcpy(sb->data, data, len);
@@ -662,9 +662,9 @@ unsigned char *silc_buffer_put_tail(SilcBuffer sb,
                                    SilcUInt32 len)
 {
 #if defined(SILC_DEBUG)
-  assert(len <= silc_buffer_taillen(sb));
+  SILC_ASSERT(len <= silc_buffer_taillen(sb));
 #else
-  if (len > silc_buffer_taillen(sb))
+  if (silc_unlikely(len > silc_buffer_taillen(sb)))
     return NULL;
 #endif
   return (unsigned char *)memcpy(sb->tail, data, len);
@@ -689,7 +689,7 @@ static inline
 SilcBuffer silc_buffer_alloc_size(SilcUInt32 len)
 {
   SilcBuffer sb = silc_buffer_alloc(len);
-  if (!sb)
+  if (silc_unlikely(!sb))
     return NULL;
   silc_buffer_pull_tail(sb, len);
   return sb;
@@ -737,6 +737,48 @@ void silc_buffer_clear(SilcBuffer sb)
   silc_buffer_reset(sb);
 }
 
+/****f* silcutil/SilcBufferAPI/silc_buffer_start
+ *
+ * SYNOPSIS
+ *
+ *    static inline
+ *    void silc_buffer_start(SilcBuffer sb);
+ *
+ * DESCRIPTION
+ *
+ *    Moves the data area at the start of the buffer.  The tail area remains
+ *    as is.
+ *
+ ***/
+
+static inline
+void silc_buffer_start(SilcBuffer sb)
+{
+  sb->data = sb->head;
+}
+
+/****f* silcutil/SilcBufferAPI/silc_buffer_end
+ *
+ * SYNOPSIS
+ *
+ *    static inline
+ *    void silc_buffer_end(SilcBuffer sb);
+ *
+ * DESCRIPTION
+ *
+ *    Moves the end of the data area to the end of the buffer.  The start
+ *    of the data area remains same.  If the start of data area is at the
+ *    start of the buffer, after this function returns the buffer's data
+ *    area length is the length of the entire buffer.
+ *
+ ***/
+
+static inline
+void silc_buffer_end(SilcBuffer sb)
+{
+  sb->tail = sb->end;
+}
+
 /****f* silcutil/SilcBufferAPI/silc_buffer_copy
  *
  * SYNOPSIS
@@ -758,7 +800,7 @@ SilcBuffer silc_buffer_copy(SilcBuffer sb)
   SilcBuffer sb_new;
 
   sb_new = silc_buffer_alloc_size(silc_buffer_len(sb));
-  if (!sb_new)
+  if (silc_unlikely(!sb_new))
     return NULL;
   silc_buffer_put(sb_new, sb->data, silc_buffer_len(sb));
 
@@ -786,7 +828,7 @@ SilcBuffer silc_buffer_clone(SilcBuffer sb)
   SilcBuffer sb_new;
 
   sb_new = silc_buffer_alloc_size(silc_buffer_truelen(sb));
-  if (!sb_new)
+  if (silc_unlikely(!sb_new))
     return NULL;
   silc_buffer_put(sb_new, sb->head, silc_buffer_truelen(sb));
   sb_new->data = sb_new->head + silc_buffer_headlen(sb);
@@ -820,13 +862,13 @@ SilcBuffer silc_buffer_realloc(SilcBuffer sb, SilcUInt32 newsize)
   if (!sb)
     return silc_buffer_alloc(newsize);
 
-  if (newsize <= silc_buffer_truelen(sb))
+  if (silc_unlikely(newsize <= silc_buffer_truelen(sb)))
     return sb;
 
   hlen = silc_buffer_headlen(sb);
   dlen = silc_buffer_len(sb);
   h = (unsigned char *)silc_realloc(sb->head, newsize);
-  if (!h)
+  if (silc_unlikely(!h))
     return NULL;
   sb->head = h;
   sb->data = sb->head + hlen;
@@ -855,12 +897,45 @@ static inline
 SilcBuffer silc_buffer_realloc_size(SilcBuffer sb, SilcUInt32 newsize)
 {
   sb = silc_buffer_realloc(sb, newsize);
-  if (!sb)
+  if (silc_unlikely(!sb))
     return NULL;
   silc_buffer_pull_tail(sb, silc_buffer_taillen(sb));
   return sb;
 }
 
+/****f* silcutil/SilcBufferAPI/silc_buffer_enlarge
+ *
+ * SYNOPSIS
+ *
+ *    static inline
+ *    SilcBuffer silc_buffer_enlarge(SilcBuffer sb, SilcUInt32 size);
+ *
+ * DESCRIPTION
+ *
+ *    Enlarges the buffer by the amount of `size' if it doesn't have that
+ *    must space in the data area and in the tail area.  Moves the tail
+ *    area automatically after enlarging so that the current data area
+ *    is at least the size of `size'.  If there is more space than `size'
+ *    in the data area this does not do anything.  If there is enough
+ *    space in the tail area this merely moves the tail area to reveal
+ *    the extra space.  Returns FALSE on error.
+ *
+ ***/
+
+static inline
+SilcBool silc_buffer_enlarge(SilcBuffer sb, SilcUInt32 size)
+{
+  if (size > silc_buffer_len(sb)) {
+    if (size > silc_buffer_taillen(sb) + silc_buffer_len(sb))
+      if (silc_unlikely(!silc_buffer_realloc(sb, silc_buffer_truelen(sb) +
+                                            (size - silc_buffer_taillen(sb) -
+                                             silc_buffer_len(sb)))))
+       return FALSE;
+    silc_buffer_pull_tail(sb, size - silc_buffer_len(sb));
+  }
+  return TRUE;
+}
+
 
 /* SilcStack aware SilcBuffer routines */
 
@@ -890,12 +965,12 @@ SilcBuffer silc_buffer_salloc(SilcStack stack, SilcUInt32 len)
 
   /* Allocate new SilcBuffer */
   sb = (SilcBuffer)silc_scalloc(stack, 1, sizeof(*sb));
-  if (!sb)
+  if (silc_unlikely(!sb))
     return NULL;
 
   /* Allocate the actual data area */
   sb->head = (unsigned char *)silc_smalloc_ua(stack, len);
-  if (!sb->head)
+  if (silc_unlikely(!sb->head))
     return NULL;
 
   /* Set pointers to the new buffer */
@@ -928,7 +1003,7 @@ static inline
 SilcBuffer silc_buffer_salloc_size(SilcStack stack, SilcUInt32 len)
 {
   SilcBuffer sb = silc_buffer_salloc(stack, len);
-  if (!sb)
+  if (silc_unlikely(!sb))
     return NULL;
   silc_buffer_pull_tail(sb, len);
   return sb;
@@ -976,8 +1051,8 @@ SilcBuffer silc_buffer_srealloc(SilcStack stack,
   if (!h) {
     /* Do slow and stack wasting realloc.  The old sb->head is lost and
        is freed eventually. */
-    h = silc_smalloc_ua(stack, newsize);
-    if (!h)
+    h = (unsigned char *)silc_smalloc_ua(stack, newsize);
+    if (silc_unlikely(!h))
       return NULL;
     memcpy(h, sb->head, silc_buffer_truelen(sb));
   }
@@ -1014,12 +1089,50 @@ SilcBuffer silc_buffer_srealloc_size(SilcStack stack,
                                     SilcBuffer sb, SilcUInt32 newsize)
 {
   sb = silc_buffer_srealloc(stack, sb, newsize);
-  if (!sb)
+  if (silc_unlikely(!sb))
     return NULL;
   silc_buffer_pull_tail(sb, silc_buffer_taillen(sb));
   return sb;
 }
 
+/****f* silcutil/SilcBufferAPI/silc_buffer_senlarge
+ *
+ * SYNOPSIS
+ *
+ *    static inline
+ *    SilcBuffer silc_buffer_senlarge(SilcStack stack, SilcBuffer sb,
+ *                                    SilcUInt32 size);
+ *
+ * DESCRIPTION
+ *
+ *    Enlarges the buffer by the amount of `size' if it doesn't have that
+ *    must space in the data area and in the tail area.  Moves the tail
+ *    area automatically after enlarging so that the current data area
+ *    is at least the size of `size'.  If there is more space than `size'
+ *    in the data area this does not do anything.  If there is enough
+ *    space in the tail area this merely moves the tail area to reveal
+ *    the extra space.  Returns FALSE on error.
+ *
+ *    This routine use SilcStack are memory source.  If `stack' is NULL
+ *    reverts back to normal allocating routine.
+ *
+ ***/
+
+static inline
+SilcBool silc_buffer_senlarge(SilcStack stack, SilcBuffer sb, SilcUInt32 size)
+{
+  if (size > silc_buffer_len(sb)) {
+    if (size > silc_buffer_taillen(sb) + silc_buffer_len(sb))
+      if (silc_unlikely(!silc_buffer_srealloc(stack, sb,
+                                             silc_buffer_truelen(sb) +
+                                             (size - silc_buffer_taillen(sb) -
+                                              silc_buffer_len(sb)))))
+       return FALSE;
+    silc_buffer_pull_tail(sb, size - silc_buffer_len(sb));
+  }
+  return TRUE;
+}
+
 /****f* silcutil/SilcBufferAPI/silc_buffer_scopy
  *
  * SYNOPSIS
@@ -1044,7 +1157,7 @@ SilcBuffer silc_buffer_scopy(SilcStack stack, SilcBuffer sb)
   SilcBuffer sb_new;
 
   sb_new = silc_buffer_salloc_size(stack, silc_buffer_len(sb));
-  if (!sb_new)
+  if (silc_unlikely(!sb_new))
     return NULL;
   silc_buffer_put(sb_new, sb->data, silc_buffer_len(sb));
 
@@ -1075,7 +1188,7 @@ SilcBuffer silc_buffer_sclone(SilcStack stack, SilcBuffer sb)
   SilcBuffer sb_new;
 
   sb_new = silc_buffer_salloc_size(stack, silc_buffer_truelen(sb));
-  if (!sb_new)
+  if (silc_unlikely(!sb_new))
     return NULL;
   silc_buffer_put(sb_new, sb->head, silc_buffer_truelen(sb));
   sb_new->data = sb_new->head + silc_buffer_headlen(sb);