Commit 9c897e74 authored by Pekka Pessi's avatar Pekka Pessi

Gcc4 fixes.

darcs-hash:20050908181847-65a35-c9b8b35a36bcd796d545a4dc5f7520f662811619.gz
parent c7140cae
......@@ -196,7 +196,7 @@ int base64_e(char buf[], int bsiz, void *data, int dsiz)
unsigned char *s = (unsigned char *)buf;
unsigned char *b = (unsigned char *)data;
unsigned long w;
size_t i, n, slack = (size_t)dsiz % 3;
size_t i, n, slack = (unsigned)dsiz % 3;
size_t dsize = (size_t)dsiz - slack, bsize = (size_t)bsiz;
if (bsize == 0)
......
......@@ -919,7 +919,7 @@ int auth_readdb_internal(auth_mod_t *am, int always)
f = fopen(am->am_db, "rb");
if (f) {
void *buffer;
void *buffer = NULL;
auth_passwd_t *fresh = NULL;
#if HAVE_FLOCK
......
......@@ -140,6 +140,10 @@ struct auth_splugin_t
};
static void delayed_auth_method_recv(su_root_magic_t *rm,
su_msg_r msg,
auth_splugin_t *u);
static void delayed_auth_method_recv(su_root_magic_t *rm,
su_msg_r msg,
auth_splugin_t *u);
......
......@@ -2493,7 +2493,7 @@ int nmedia_save_params(struct nua_media_state *nm,
#endif
int hold = nm->nm_hold_remote;
int clone = nm->nm_clone;
enum nua_af af = nm->nm_af;
int af = nm->nm_af;
if (!tags)
return 0;
......
......@@ -131,7 +131,7 @@ tag_typedef_t nutag_phrase = STRTAG_TYPEDEF(phrase);
tag_typedef_t nutag_handle = PTRTAG_TYPEDEF(handle);
tag_typedef_t nutag_hold = INTTAG_TYPEDEF(hold);
tag_typedef_t nutag_hold = BOOLTAG_TYPEDEF(hold);
tag_typedef_t nutag_notify_refer = PTRTAG_TYPEDEF(notify_refer);
tag_typedef_t nutag_refer_event = SIPHDRTAG_NAMED_TYPEDEF(refer_event, event);
......
......@@ -470,7 +470,7 @@ extern tag_typedef_t nutag_early_media_ref;
* nua_get_params()
*
* @par Parameter type
* unsigned int
* int (enum nua_af)
*
* @par Values
* @c 0 no timer \n
......@@ -718,7 +718,7 @@ extern tag_typedef_t nutag_enableMessenger_ref;
* nua_get_params()
*
* @par Parameter type
* int
* boolean
*
* @par Values
* @c 0 S/MIME is Disabled \n
......@@ -1151,7 +1151,7 @@ extern tag_typedef_t nutag_handle_ref;
* nua_update()
*
* @par Parameter type
* unsigned int
* int (boolean)
*
* @par Values
* @c 1 hold call \n
......@@ -1159,10 +1159,10 @@ extern tag_typedef_t nutag_handle_ref;
*
* Corresponding tag taking reference parameter is NUTAG_HOLD_REF()
*/
#define NUTAG_HOLD(x) nutag_hold, tag_uint_v(x)
#define NUTAG_HOLD(x) nutag_hold, tag_bool_v(x)
extern tag_typedef_t nutag_hold;
#define NUTAG_HOLD_REF(x) nutag_hold_ref, tag_uint_vr(&(x))
#define NUTAG_HOLD_REF(x) nutag_hold_ref, tag_bool_vr(&(x))
extern tag_typedef_t nutag_hold_ref;
/** Refer reply handle (used with refer)
......
......@@ -174,7 +174,7 @@ int prefix##_resize(void *realloc_arg, \
\
pr->pr##table = new_hash, pr->pr##size = new_size; \
\
if (old_hash) halloc(realloc_arg, old_hash, 0); \
if (old_hash) old_hash = halloc(realloc_arg, old_hash, 0); \
\
assert(pr->pr##used == used);\
\
......
......@@ -294,7 +294,7 @@ struct in_addr6 const *su_in6addr_loopback(void)
/** Scatter/gather send */
int su_vsend(su_socket_t s, su_iovec_t const iov[], int iovlen, int flags,
su_sockaddr_t const *su, int sulen)
su_sockaddr_t const *su, socklen_t sulen)
{
DWORD bytes_sent = 0;
DWORD ret;
......
......@@ -1507,7 +1507,7 @@ void tport_zap_secondary(tport_t *self)
if (self->tp_queue && self->tp_queue[self->tp_qhead]) {
size_t n = 0, i, N = self->tp_params->tpp_qsize;
for (i = self->tp_qhead; self->tp_queue[i]; i = ++i % N) {
for (i = self->tp_qhead; self->tp_queue[i]; i = (i + 1) % N) {
msg_destroy(self->tp_queue[i]), self->tp_queue[i] = NULL;
n++;
}
......@@ -3438,7 +3438,7 @@ static int tport_recv_sigcomp_r(tport_t *self,
int veclen;
msg_iovec_t iovec[msg_n_fragments] = {{ 0 }};
su_sockaddr_t su[1];
int su_size = sizeof(su);
socklen_t su_size = sizeof(su);
struct sigcomp_buffer *input, *output;
void *data;
unsigned dlen;
......@@ -3673,7 +3673,7 @@ void tport_try_accept_sigcomp(tport_t *self, msg_t *msg)
else {
if (tport_log->log_level >= 5) {
char const *name;
unsigned namelen;
int namelen;
name = sigcomp_compartment_name(self->tp_sigcomp->sc_cc, &namelen);
SU_DEBUG_5(("tport(%p): msg %p SigComp implicit accept '%.*s'\n",
......@@ -3704,7 +3704,7 @@ tport_sigcomp_accept(tport_t *self,
if (udvm) {
if (tport_log->log_level >= 5) {
char const *name;
unsigned namelen;
int namelen;
if (cc) {
name = sigcomp_compartment_name(cc, &namelen);
......@@ -6062,7 +6062,7 @@ typedef struct
struct sigcomp_compartment *tpd_cc;
#endif
struct sigcomp_udvm *tpd_udvm;
int tpd_namelen;
socklen_t tpd_namelen;
su_sockaddr_t tpd_name[1];
} thrp_udp_deliver_t;
......@@ -6370,7 +6370,7 @@ int thrp_udp_recv(tport_threadpool_t *thrp, thrp_udp_deliver_t *tpd)
#if HAVE_SIGCOMP
else if (thrp->thrp_compartment) {
struct sigcomp_buffer *input;
char *data;
void *data;
int dlen;
tpd->tpd_udvm = sigcomp_udvm_create_for_compartment(thrp->thrp_compartment);
......@@ -6432,7 +6432,7 @@ int thrp_udvm_decompress(tport_threadpool_t *thrp, thrp_udp_deliver_t *tpd)
su_addrinfo_t *ai;
tport_t *tp = thrp->thrp_tport->pri_primary;
unsigned n, m, i, eos, dlen;
char *data;
void *data;
int veclen;
output = sigcomp_udvm_output_buffer(udvm, -1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment