projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use double dashes so makedepend doesn't misunderstand the flags we
[oweals/openssl.git]
/
crypto
/
bio
/
bss_rtcp.c
diff --git
a/crypto/bio/bss_rtcp.c
b/crypto/bio/bss_rtcp.c
index 4ad0739464b9d19473f87f19d609363575eb549c..7dae4855640645615f03c533250a2bb9b6f96b6b 100644
(file)
--- a/
crypto/bio/bss_rtcp.c
+++ b/
crypto/bio/bss_rtcp.c
@@
-88,11
+88,11
@@
struct rpc_ctx {
struct rpc_msg msg;
};
struct rpc_msg msg;
};
-static int rtcp_write(BIO *h,char *buf,int num);
+static int rtcp_write(BIO *h,c
onst c
har *buf,int num);
static int rtcp_read(BIO *h,char *buf,int size);
static int rtcp_read(BIO *h,char *buf,int size);
-static int rtcp_puts(BIO *h,char *str);
+static int rtcp_puts(BIO *h,c
onst c
har *str);
static int rtcp_gets(BIO *h,char *str,int size);
static int rtcp_gets(BIO *h,char *str,int size);
-static long rtcp_ctrl(BIO *h,int cmd,long arg1,
char
*arg2);
+static long rtcp_ctrl(BIO *h,int cmd,long arg1,
void
*arg2);
static int rtcp_new(BIO *h);
static int rtcp_free(BIO *data);
static int rtcp_new(BIO *h);
static int rtcp_free(BIO *data);
@@
-156,7
+156,7
@@
static int rtcp_new(BIO *bi)
bi->init=1;
bi->num=0;
bi->flags = 0;
bi->init=1;
bi->num=0;
bi->flags = 0;
- bi->ptr=
M
alloc(sizeof(struct rpc_ctx));
+ bi->ptr=
OPENSSL_m
alloc(sizeof(struct rpc_ctx));
ctx = (struct rpc_ctx *) bi->ptr;
ctx->filled = 0;
ctx->pos = 0;
ctx = (struct rpc_ctx *) bi->ptr;
ctx->filled = 0;
ctx->pos = 0;
@@
-166,7
+166,7
@@
static int rtcp_new(BIO *bi)
static int rtcp_free(BIO *a)
{
if (a == NULL) return(0);
static int rtcp_free(BIO *a)
{
if (a == NULL) return(0);
- if ( a->ptr )
F
ree ( a->ptr );
+ if ( a->ptr )
OPENSSL_f
ree ( a->ptr );
a->ptr = NULL;
return(1);
}
a->ptr = NULL;
return(1);
}
@@
-218,7
+218,7
@@
static int rtcp_read(BIO *b, char *out, int outl)
return length;
}
return length;
}
-static int rtcp_write(BIO *b, char *in, int inl)
+static int rtcp_write(BIO *b, c
onst c
har *in, int inl)
{
int status, i, segment, length;
struct rpc_ctx *ctx;
{
int status, i, segment, length;
struct rpc_ctx *ctx;
@@
-247,7
+247,7
@@
static int rtcp_write(BIO *b, char *in, int inl)
return(i);
}
return(i);
}
-static long rtcp_ctrl(BIO *b, int cmd, long num,
char
*ptr)
+static long rtcp_ctrl(BIO *b, int cmd, long num,
void
*ptr)
{
long ret=1;
{
long ret=1;
@@
-283,7
+283,7
@@
static int rtcp_gets(BIO *bp, char *buf, int size)
return(0);
}
return(0);
}
-static int rtcp_puts(BIO *bp, char *str)
+static int rtcp_puts(BIO *bp, c
onst c
har *str)
{
int length;
if (str == NULL) return(0);
{
int length;
if (str == NULL) return(0);