X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcbuffmt.h;h=e69e90bb6c6ce31cf11b0fe213cf5c30a807b8b8;hp=8b281eedf663a9f723e4665d69e634d11955748f;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hpb=7910ce2a5c55211a4ea09a52832c6ed32c0b64fd diff --git a/lib/silcutil/silcbuffmt.h b/lib/silcutil/silcbuffmt.h index 8b281eed..e69e90bb 100644 --- a/lib/silcutil/silcbuffmt.h +++ b/lib/silcutil/silcbuffmt.h @@ -91,34 +91,34 @@ typedef enum { #define SILC_STR_SI_CHAR(x) SILC_BUFFER_PARAM_SI8_CHAR, (x) #define SILC_STR_UI_CHAR(x) SILC_BUFFER_PARAM_UI8_CHAR, (x) -/* Signed/uint16. +/* Signed/SilcUInt16. Formatting: SILC_STR_SI_SHORT(short) - SILC_STR_UI_SHORT(uint16) + SILC_STR_UI_SHORT(SilcUInt16) Unformatting: SILC_STR_SI_SHORT(short *) - SILC_STR_UI_SHORT(uint16 *) + SILC_STR_UI_SHORT(SilcUInt16 *) */ #define SILC_STR_SI_SHORT(x) SILC_BUFFER_PARAM_SI16_SHORT, (x) #define SILC_STR_UI_SHORT(x) SILC_BUFFER_PARAM_UI16_SHORT, (x) -/* Signed/uint32. +/* Signed/SilcUInt32. Formatting: SILC_STR_SI_INT(int) - SILC_STR_UI_INT(uint32) + SILC_STR_UI_INT(SilcUInt32) Unformatting: SILC_STR_SI_INT(int *) - SILC_STR_UI_INT(uint32 *) + SILC_STR_UI_INT(SilcUInt32 *) */ #define SILC_STR_SI_INT(x) SILC_BUFFER_PARAM_SI32_INT, (x) #define SILC_STR_UI_INT(x) SILC_BUFFER_PARAM_UI32_INT, (x) -/* Signed/uint64. +/* Signed/SilcUInt64. Formatting: SILC_STR_SI_INT64(int) - SILC_STR_UI_INT64(uint32) + SILC_STR_UI_INT64(SilcUInt32) Unformatting: SILC_STR_SI_INT64(int *) - SILC_STR_UI_INT64(uint32 *) + SILC_STR_UI_INT64(SilcUInt32 *) */ #define SILC_STR_SI_INT64(x) SILC_BUFFER_PARAM_SI64_INT, (x) @@ -161,8 +161,8 @@ typedef enum { /* Unsigned string. Second argument is the length of the string. - Formatting: SILC_STR_UI32_NSTRING(unsigned char *, uint32) - Unformatting: SILC_STR_UI32_NSTRING(unsigned char **, uint32 *) + Formatting: SILC_STR_UI32_NSTRING(unsigned char *, SilcUInt32) + Unformatting: SILC_STR_UI32_NSTRING(unsigned char **, SilcUInt32 *) Unformatting procedure will check for length of the string from the buffer before trying to get the string out. Thus, one *must* format the @@ -203,7 +203,7 @@ typedef enum { the string. Formatting: This is equal to using *_NSTRING - Unformatting: SILC_STR_UI_XNSTRING(unsigned char **, uint32) + Unformatting: SILC_STR_UI_XNSTRING(unsigned char **, SilcUInt32) This type can be used to take arbitrary length string from the buffer by sending the requested amount of bytes as argument. This differs