Merge SVN r1287 from trunk to 2.0.x branch:
* src/tls/tls_drv.c: Fixed gcc signedness warnings (EJAB-447) * src/ejabberd_zlib/ejabberd_zlib_drv.c: Likewise * src/expat_erl.c: Removed R9B workaround (EJAB-447) SVN Revision: 1289
This commit is contained in:
parent
cfeb6f9c2b
commit
bb5e7353a4
|
@ -1,3 +1,10 @@
|
|||
2008-04-11 Alexey Shchepin <alexey@process-one.net>
|
||||
|
||||
* src/tls/tls_drv.c: Fixed gcc signedness warnings (EJAB-447)
|
||||
* src/ejabberd_zlib/ejabberd_zlib_drv.c: Likewise
|
||||
|
||||
* src/expat_erl.c: Removed R9B workaround (EJAB-447)
|
||||
|
||||
2008-04-10 Christophe Romain <christophe.romain@process-one.net>
|
||||
|
||||
* src/mod_pubsub/mod_pubsub.erl: fix identity and database update
|
||||
|
|
|
@ -107,14 +107,14 @@ static int ejabberd_zlib_drv_control(ErlDrvData handle,
|
|||
b = driver_alloc_binary(size);
|
||||
b->orig_bytes[0] = 0;
|
||||
|
||||
d->d_stream->next_in = buf;
|
||||
d->d_stream->next_in = (unsigned char *)buf;
|
||||
d->d_stream->avail_in = len;
|
||||
d->d_stream->avail_out = 0;
|
||||
err = Z_OK;
|
||||
|
||||
while (err == Z_OK && d->d_stream->avail_out == 0)
|
||||
{
|
||||
d->d_stream->next_out = b->orig_bytes + rlen;
|
||||
d->d_stream->next_out = (unsigned char *)b->orig_bytes + rlen;
|
||||
d->d_stream->avail_out = BUF_SIZE;
|
||||
|
||||
err = deflate(d->d_stream, Z_SYNC_FLUSH);
|
||||
|
@ -135,14 +135,14 @@ static int ejabberd_zlib_drv_control(ErlDrvData handle,
|
|||
b->orig_bytes[0] = 0;
|
||||
|
||||
if (len > 0) {
|
||||
d->i_stream->next_in = buf;
|
||||
d->i_stream->next_in = (unsigned char *)buf;
|
||||
d->i_stream->avail_in = len;
|
||||
d->i_stream->avail_out = 0;
|
||||
err = Z_OK;
|
||||
|
||||
while (err == Z_OK && d->i_stream->avail_out == 0)
|
||||
{
|
||||
d->i_stream->next_out = b->orig_bytes + rlen;
|
||||
d->i_stream->next_out = (unsigned char *)b->orig_bytes + rlen;
|
||||
d->i_stream->avail_out = BUF_SIZE;
|
||||
|
||||
err = inflate(d->i_stream, Z_SYNC_FLUSH);
|
||||
|
|
|
@ -250,7 +250,7 @@ static int tls_drv_control(ErlDrvData handle,
|
|||
rlen++;
|
||||
b = driver_alloc_binary(rlen);
|
||||
b->orig_bytes[0] = 0;
|
||||
tmp_buf = &b->orig_bytes[1];
|
||||
tmp_buf = (unsigned char *)&b->orig_bytes[1];
|
||||
i2d_X509(cert, &tmp_buf);
|
||||
X509_free(cert);
|
||||
*rbuf = (char *)b;
|
||||
|
|
Loading…
Reference in New Issue