projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
lib
/
silcutil
/
silcbuffmt.c
diff --git
a/lib/silcutil/silcbuffmt.c
b/lib/silcutil/silcbuffmt.c
index 86edee11b1da29fe418a4e9500f8e06e53a16780..be83be57936443bcd2af45a64ffba06761f357a0 100644
(file)
--- a/
lib/silcutil/silcbuffmt.c
+++ b/
lib/silcutil/silcbuffmt.c
@@
-79,7
+79,7
@@
int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
case SILC_BUFFER_PARAM_SI16_SHORT:
{
unsigned char xf[2];
case SILC_BUFFER_PARAM_SI16_SHORT:
{
unsigned char xf[2];
-
int16 x = (i
nt16)va_arg(ap, int);
+
SilcInt16 x = (SilcI
nt16)va_arg(ap, int);
HAS_SPACE(dst, 2);
SILC_PUT16_MSB(x, xf);
silc_buffer_put(dst, xf, 2);
HAS_SPACE(dst, 2);
SILC_PUT16_MSB(x, xf);
silc_buffer_put(dst, xf, 2);
@@
-89,7
+89,7
@@
int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
case SILC_BUFFER_PARAM_UI16_SHORT:
{
unsigned char xf[2];
case SILC_BUFFER_PARAM_UI16_SHORT:
{
unsigned char xf[2];
-
uint16 x = (ui
nt16)va_arg(ap, int);
+
SilcUInt16 x = (SilcUI
nt16)va_arg(ap, int);
HAS_SPACE(dst, 2);
SILC_PUT16_MSB(x, xf);
silc_buffer_put(dst, xf, 2);
HAS_SPACE(dst, 2);
SILC_PUT16_MSB(x, xf);
silc_buffer_put(dst, xf, 2);
@@
-99,7
+99,7
@@
int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
case SILC_BUFFER_PARAM_SI32_INT:
{
unsigned char xf[4];
case SILC_BUFFER_PARAM_SI32_INT:
{
unsigned char xf[4];
-
int32 x = va_arg(ap, i
nt32);
+
SilcInt32 x = va_arg(ap, SilcI
nt32);
HAS_SPACE(dst, 4);
SILC_PUT32_MSB(x, xf);
silc_buffer_put(dst, xf, 4);
HAS_SPACE(dst, 4);
SILC_PUT32_MSB(x, xf);
silc_buffer_put(dst, xf, 4);
@@
-109,7
+109,7
@@
int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
case SILC_BUFFER_PARAM_UI32_INT:
{
unsigned char xf[4];
case SILC_BUFFER_PARAM_UI32_INT:
{
unsigned char xf[4];
-
uint32 x = va_arg(ap, ui
nt32);
+
SilcUInt32 x = va_arg(ap, SilcUI
nt32);
HAS_SPACE(dst, 4);
SILC_PUT32_MSB(x, xf);
silc_buffer_put(dst, xf, 4);
HAS_SPACE(dst, 4);
SILC_PUT32_MSB(x, xf);
silc_buffer_put(dst, xf, 4);
@@
-119,7
+119,7
@@
int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
case SILC_BUFFER_PARAM_SI64_INT:
{
unsigned char xf[8];
case SILC_BUFFER_PARAM_SI64_INT:
{
unsigned char xf[8];
-
int64 x = va_arg(ap, i
nt64);
+
SilcInt64 x = va_arg(ap, SilcI
nt64);
HAS_SPACE(dst, 8);
SILC_PUT64_MSB(x, xf);
silc_buffer_put(dst, xf, 8);
HAS_SPACE(dst, 8);
SILC_PUT64_MSB(x, xf);
silc_buffer_put(dst, xf, 8);
@@
-129,7
+129,7
@@
int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
case SILC_BUFFER_PARAM_UI64_INT:
{
unsigned char xf[8];
case SILC_BUFFER_PARAM_UI64_INT:
{
unsigned char xf[8];
-
uint64 x = va_arg(ap, ui
nt64);
+
SilcUInt64 x = va_arg(ap, SilcUI
nt64);
HAS_SPACE(dst, 8);
SILC_PUT64_MSB(x, xf);
silc_buffer_put(dst, xf, 8);
HAS_SPACE(dst, 8);
SILC_PUT64_MSB(x, xf);
silc_buffer_put(dst, xf, 8);
@@
-144,7
+144,7
@@
int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
case SILC_BUFFER_PARAM_UI32_STRING_ALLOC:
{
unsigned char *x = va_arg(ap, unsigned char *);
case SILC_BUFFER_PARAM_UI32_STRING_ALLOC:
{
unsigned char *x = va_arg(ap, unsigned char *);
-
ui
nt32 tmp_len = strlen(x);
+
SilcUI
nt32 tmp_len = strlen(x);
HAS_SPACE(dst, tmp_len);
silc_buffer_put(dst, x, tmp_len);
silc_buffer_pull(dst, tmp_len);
HAS_SPACE(dst, tmp_len);
silc_buffer_put(dst, x, tmp_len);
silc_buffer_pull(dst, tmp_len);
@@
-160,7
+160,7
@@
int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC:
{
unsigned char *x = va_arg(ap, unsigned char *);
case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC:
{
unsigned char *x = va_arg(ap, unsigned char *);
-
uint32 len = va_arg(ap, ui
nt32);
+
SilcUInt32 len = va_arg(ap, SilcUI
nt32);
HAS_SPACE(dst, len);
silc_buffer_put(dst, x, len);
silc_buffer_pull(dst, len);
HAS_SPACE(dst, len);
silc_buffer_put(dst, x, len);
silc_buffer_pull(dst, len);
@@
-236,7
+236,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_SI16_SHORT:
{
}
case SILC_BUFFER_PARAM_SI16_SHORT:
{
-
int16 *x = va_arg(ap, i
nt16 *);
+
SilcInt16 *x = va_arg(ap, SilcI
nt16 *);
HAS_SPACE(src, 2);
if (x)
SILC_GET16_MSB(*x, src->data);
HAS_SPACE(src, 2);
if (x)
SILC_GET16_MSB(*x, src->data);
@@
-245,7
+245,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI16_SHORT:
{
}
case SILC_BUFFER_PARAM_UI16_SHORT:
{
-
uint16 *x = va_arg(ap, ui
nt16 *);
+
SilcUInt16 *x = va_arg(ap, SilcUI
nt16 *);
HAS_SPACE(src, 2);
if (x)
SILC_GET16_MSB(*x, src->data);
HAS_SPACE(src, 2);
if (x)
SILC_GET16_MSB(*x, src->data);
@@
-254,7
+254,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_SI32_INT:
{
}
case SILC_BUFFER_PARAM_SI32_INT:
{
-
int32 *x = va_arg(ap, i
nt32 *);
+
SilcInt32 *x = va_arg(ap, SilcI
nt32 *);
HAS_SPACE(src, 4);
if (x)
SILC_GET32_MSB(*x, src->data);
HAS_SPACE(src, 4);
if (x)
SILC_GET32_MSB(*x, src->data);
@@
-263,7
+263,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI32_INT:
{
}
case SILC_BUFFER_PARAM_UI32_INT:
{
-
uint32 *x = va_arg(ap, ui
nt32 *);
+
SilcUInt32 *x = va_arg(ap, SilcUI
nt32 *);
HAS_SPACE(src, 4);
if (x)
SILC_GET32_MSB(*x, src->data);
HAS_SPACE(src, 4);
if (x)
SILC_GET32_MSB(*x, src->data);
@@
-272,7
+272,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_SI64_INT:
{
}
case SILC_BUFFER_PARAM_SI64_INT:
{
-
int64 *x = va_arg(ap, i
nt64 *);
+
SilcInt64 *x = va_arg(ap, SilcI
nt64 *);
HAS_SPACE(src, 8);
if (x)
SILC_GET64_MSB(*x, src->data);
HAS_SPACE(src, 8);
if (x)
SILC_GET64_MSB(*x, src->data);
@@
-281,7
+281,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI64_INT:
{
}
case SILC_BUFFER_PARAM_UI64_INT:
{
-
uint64 *x = va_arg(ap, ui
nt64 *);
+
SilcUInt64 *x = va_arg(ap, SilcUI
nt64 *);
HAS_SPACE(src, 8);
if (x)
SILC_GET64_MSB(*x, src->data);
HAS_SPACE(src, 8);
if (x)
SILC_GET64_MSB(*x, src->data);
@@
-290,10
+290,10
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI8_STRING:
{
}
case SILC_BUFFER_PARAM_UI8_STRING:
{
-
ui
nt8 len2;
+
SilcUI
nt8 len2;
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 1);
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 1);
- len2 = (
ui
nt8)src->data[0];
+ len2 = (
SilcUI
nt8)src->data[0];
silc_buffer_pull(src, 1);
HAS_SPACE(src, len2);
if (x)
silc_buffer_pull(src, 1);
HAS_SPACE(src, len2);
if (x)
@@
-303,7
+303,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI16_STRING:
{
}
case SILC_BUFFER_PARAM_UI16_STRING:
{
-
ui
nt16 len2;
+
SilcUI
nt16 len2;
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
@@
-316,10
+316,10
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI8_STRING_ALLOC:
{
}
case SILC_BUFFER_PARAM_UI8_STRING_ALLOC:
{
-
ui
nt8 len2;
+
SilcUI
nt8 len2;
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 1);
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 1);
- len2 = (
ui
nt8)src->data[0];
+ len2 = (
SilcUI
nt8)src->data[0];
silc_buffer_pull(src, 1);
HAS_SPACE(src, len2);
if (x && len2) {
silc_buffer_pull(src, 1);
HAS_SPACE(src, len2);
if (x && len2) {
@@
-331,7
+331,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI16_STRING_ALLOC:
{
}
case SILC_BUFFER_PARAM_UI16_STRING_ALLOC:
{
-
ui
nt16 len2;
+
SilcUI
nt16 len2;
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
@@
-346,7
+346,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI32_STRING:
{
}
case SILC_BUFFER_PARAM_UI32_STRING:
{
-
ui
nt32 len2;
+
SilcUI
nt32 len2;
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
@@
-359,7
+359,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI32_STRING_ALLOC:
{
}
case SILC_BUFFER_PARAM_UI32_STRING_ALLOC:
{
-
ui
nt32 len2;
+
SilcUI
nt32 len2;
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
unsigned char **x = va_arg(ap, unsigned char **);
HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
@@
-374,11
+374,11
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI8_NSTRING:
{
}
case SILC_BUFFER_PARAM_UI8_NSTRING:
{
-
ui
nt8 len2;
+
SilcUI
nt8 len2;
unsigned char **x = va_arg(ap, unsigned char **);
unsigned char **x = va_arg(ap, unsigned char **);
-
uint8 *len = va_arg(ap, ui
nt8 *);
+
SilcUInt8 *len = va_arg(ap, SilcUI
nt8 *);
HAS_SPACE(src, 1);
HAS_SPACE(src, 1);
- len2 = (
ui
nt8)src->data[0];
+ len2 = (
SilcUI
nt8)src->data[0];
silc_buffer_pull(src, 1);
HAS_SPACE(src, len2);
if (len)
silc_buffer_pull(src, 1);
HAS_SPACE(src, len2);
if (len)
@@
-390,9
+390,9
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI16_NSTRING:
{
}
case SILC_BUFFER_PARAM_UI16_NSTRING:
{
-
ui
nt16 len2;
+
SilcUI
nt16 len2;
unsigned char **x = va_arg(ap, unsigned char **);
unsigned char **x = va_arg(ap, unsigned char **);
-
uint16 *len = va_arg(ap, ui
nt16 *);
+
SilcUInt16 *len = va_arg(ap, SilcUI
nt16 *);
HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
silc_buffer_pull(src, 2);
HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
silc_buffer_pull(src, 2);
@@
-406,11
+406,11
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI8_NSTRING_ALLOC:
{
}
case SILC_BUFFER_PARAM_UI8_NSTRING_ALLOC:
{
-
ui
nt8 len2;
+
SilcUI
nt8 len2;
unsigned char **x = va_arg(ap, unsigned char **);
unsigned char **x = va_arg(ap, unsigned char **);
-
uint8 *len = va_arg(ap, ui
nt8 *);
+
SilcUInt8 *len = va_arg(ap, SilcUI
nt8 *);
HAS_SPACE(src, 1);
HAS_SPACE(src, 1);
- len2 = (
ui
nt8)src->data[0];
+ len2 = (
SilcUI
nt8)src->data[0];
silc_buffer_pull(src, 1);
HAS_SPACE(src, len2);
if (len)
silc_buffer_pull(src, 1);
HAS_SPACE(src, len2);
if (len)
@@
-424,9
+424,9
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI16_NSTRING_ALLOC:
{
}
case SILC_BUFFER_PARAM_UI16_NSTRING_ALLOC:
{
-
ui
nt16 len2;
+
SilcUI
nt16 len2;
unsigned char **x = va_arg(ap, unsigned char **);
unsigned char **x = va_arg(ap, unsigned char **);
-
uint16 *len = va_arg(ap, ui
nt16 *);
+
SilcUInt16 *len = va_arg(ap, SilcUI
nt16 *);
HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
silc_buffer_pull(src, 2);
HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
silc_buffer_pull(src, 2);
@@
-442,9
+442,9
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
}
case SILC_BUFFER_PARAM_UI32_NSTRING:
{
}
case SILC_BUFFER_PARAM_UI32_NSTRING:
{
-
ui
nt32 len2;
+
SilcUI
nt32 len2;
unsigned char **x = va_arg(ap, unsigned char **);
unsigned char **x = va_arg(ap, unsigned char **);
-
uint32 *len = va_arg(ap, ui
nt32 *);
+
SilcUInt32 *len = va_arg(ap, SilcUI
nt32 *);
HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
silc_buffer_pull(src, 4);
HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
silc_buffer_pull(src, 4);
@@
-459,7
+459,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
case SILC_BUFFER_PARAM_UI_XNSTRING:
{
unsigned char **x = va_arg(ap, unsigned char **);
case SILC_BUFFER_PARAM_UI_XNSTRING:
{
unsigned char **x = va_arg(ap, unsigned char **);
-
uint32 len = va_arg(ap, ui
nt32);
+
SilcUInt32 len = va_arg(ap, SilcUI
nt32);
HAS_SPACE(src, len);
if (len && x)
*x = src->data;
HAS_SPACE(src, len);
if (len && x)
*x = src->data;
@@
-469,7
+469,7
@@
int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC:
{
unsigned char **x = va_arg(ap, unsigned char **);
case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC:
{
unsigned char **x = va_arg(ap, unsigned char **);
-
uint32 len = va_arg(ap, ui
nt32);
+
SilcUInt32 len = va_arg(ap, SilcUI
nt32);
HAS_SPACE(src, len);
if (len && x) {
*x = silc_calloc(len + 1, sizeof(unsigned char));
HAS_SPACE(src, len);
if (len && x) {
*x = silc_calloc(len + 1, sizeof(unsigned char));