projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_1_branch to trunk.
[silc.git]
/
lib
/
silcutil
/
silcbuffer.h
diff --git
a/lib/silcutil/silcbuffer.h
b/lib/silcutil/silcbuffer.h
index ff9efe3100bb7d2f82ca8bd3fc2696c5211d6bc4..5ce671175b628994820e5edd63a20efb026cb504 100644
(file)
--- a/
lib/silcutil/silcbuffer.h
+++ b/
lib/silcutil/silcbuffer.h
@@
-977,7
+977,7
@@
SilcBuffer silc_buffer_salloc(SilcStack stack, SilcUInt32 len)
return NULL;
/* Allocate the actual data area */
return NULL;
/* Allocate the actual data area */
- sb->head = (unsigned char *)silc_smalloc
_ua
(stack, len);
+ sb->head = (unsigned char *)silc_smalloc(stack, len);
if (silc_unlikely(!sb->head))
return NULL;
if (silc_unlikely(!sb->head))
return NULL;
@@
-1054,12
+1054,12
@@
SilcBuffer silc_buffer_srealloc(SilcStack stack,
hlen = silc_buffer_headlen(sb);
dlen = silc_buffer_len(sb);
hlen = silc_buffer_headlen(sb);
dlen = silc_buffer_len(sb);
- h = (unsigned char *)silc_srealloc
_ua
(stack, silc_buffer_truelen(sb),
-
sb->head, newsize);
+ h = (unsigned char *)silc_srealloc(stack, silc_buffer_truelen(sb),
+ sb->head, newsize);
if (!h) {
/* Do slow and stack wasting realloc. The old sb->head is lost and
is freed eventually. */
if (!h) {
/* Do slow and stack wasting realloc. The old sb->head is lost and
is freed eventually. */
- h = (unsigned char *)silc_smalloc
_ua
(stack, newsize);
+ h = (unsigned char *)silc_smalloc(stack, newsize);
if (silc_unlikely(!h))
return NULL;
memcpy(h, sb->head, silc_buffer_truelen(sb));
if (silc_unlikely(!h))
return NULL;
memcpy(h, sb->head, silc_buffer_truelen(sb));