projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates. New data types.
[silc.git]
/
lib
/
silcutil
/
silcutil.c
diff --git
a/lib/silcutil/silcutil.c
b/lib/silcutil/silcutil.c
index ba4b9cc7bcbd39226373bb6d0a492d55714143cb..9407febcecebdd22b1a6100b26c8c95bd3dbd74f 100644
(file)
--- a/
lib/silcutil/silcutil.c
+++ b/
lib/silcutil/silcutil.c
@@
-28,7
+28,7
@@
/* Reads a file to a buffer. The allocated buffer is returned. Length of
the file read is returned to the return_len argument. */
/* Reads a file to a buffer. The allocated buffer is returned. Length of
the file read is returned to the return_len argument. */
-char *silc_file_read(const char *filename,
int
*return_len)
+char *silc_file_read(const char *filename,
uint32
*return_len)
{
int fd;
char *buffer;
{
int fd;
char *buffer;
@@
-72,7
+72,7
@@
char *silc_file_read(const char *filename, int *return_len)
/* Writes a buffer to the file. */
/* Writes a buffer to the file. */
-int silc_file_write(const char *filename, const char *buffer,
int
len)
+int silc_file_write(const char *filename, const char *buffer,
uint32
len)
{
int fd;
{
int fd;
@@
-95,7
+95,7
@@
int silc_file_write(const char *filename, const char *buffer, int len)
set to the file. */
int silc_file_write_mode(const char *filename, const char *buffer,
set to the file. */
int silc_file_write_mode(const char *filename, const char *buffer,
-
int
len, int mode)
+
uint32
len, int mode)
{
int fd;
{
int fd;
@@
-202,10
+202,10
@@
static unsigned char pem_enc[64] =
data string. Note: This is originally public domain code and is
still PD. */
data string. Note: This is originally public domain code and is
still PD. */
-char *silc_encode_pem(unsigned char *data, u
nsigned int
len)
+char *silc_encode_pem(unsigned char *data, u
int32
len)
{
int i, j;
{
int i, j;
- u
nsigned int
bits, c, char_count;
+ u
int32
bits, c, char_count;
char *pem;
char_count = 0;
char *pem;
char_count = 0;
@@
-250,10
+250,10
@@
char *silc_encode_pem(unsigned char *data, unsigned int len)
/* Same as above but puts newline ('\n') every 72 characters. */
/* Same as above but puts newline ('\n') every 72 characters. */
-char *silc_encode_pem_file(unsigned char *data, u
nsigned int
data_len)
+char *silc_encode_pem_file(unsigned char *data, u
int32
data_len)
{
int i, j;
{
int i, j;
- u
nsigned int
len, cols;
+ u
int32
len, cols;
char *pem, *pem2;
pem = silc_encode_pem(data, data_len);
char *pem, *pem2;
pem = silc_encode_pem(data, data_len);
@@
-278,11
+278,11
@@
char *silc_encode_pem_file(unsigned char *data, unsigned int data_len)
/* Decodes PEM into data. Returns the decoded data. Note: This is
originally public domain code and is still PD. */
/* Decodes PEM into data. Returns the decoded data. Note: This is
originally public domain code and is still PD. */
-unsigned char *silc_decode_pem(unsigned char *pem, u
nsigned int
pem_len,
- u
nsigned int
*ret_len)
+unsigned char *silc_decode_pem(unsigned char *pem, u
int32
pem_len,
+ u
int32
*ret_len)
{
int i, j;
{
int i, j;
- u
nsigned int
len, c, char_count, bits;
+ u
int32
len, c, char_count, bits;
unsigned char *data;
static char ialpha[256], decoder[256];
unsigned char *data;
static char ialpha[256], decoder[256];
@@
-351,9
+351,9
@@
unsigned char *silc_decode_pem(unsigned char *pem, unsigned int pem_len,
does not know anything about these. */
int silc_parse_nickname(char *string, char **nickname, char **server,
does not know anything about these. */
int silc_parse_nickname(char *string, char **nickname, char **server,
- u
nsigned int
*num)
+ u
int32
*num)
{
{
- u
nsigned int
tlen;
+ u
int32
tlen;
char tmp[256];
if (!string)
char tmp[256];
if (!string)
@@
-400,10
+400,10
@@
int silc_parse_nickname(char *string, char **nickname, char **server,
void silc_parse_command_line(unsigned char *buffer,
unsigned char ***parsed,
void silc_parse_command_line(unsigned char *buffer,
unsigned char ***parsed,
- u
nsigned int
**parsed_lens,
- u
nsigned int
**parsed_types,
- u
nsigned int
*parsed_num,
- u
nsigned int
max_args)
+ u
int32
**parsed_lens,
+ u
int32
**parsed_types,
+ u
int32
*parsed_num,
+ u
int32
max_args)
{
int i, len = 0;
int argc = 0;
{
int i, len = 0;
int argc = 0;
@@
-474,7
+474,7
@@
char *silc_format(char *fmt, ...)
static char rid[256];
static char rid[256];
-char *silc_id_render(void *id, u
nsigned short
type)
+char *silc_id_render(void *id, u
int16
type)
{
char tmp[100];
unsigned char tmps[2];
{
char tmp[100];
unsigned char tmps[2];