fixed compiler warnings on 64bit

This commit is contained in:
Martin Willi
2009-04-22 08:26:54 +00:00
parent faf0e41801
commit 090ba9453c
4 changed files with 8 additions and 8 deletions
@@ -69,9 +69,9 @@ struct attribute_manager_t {
void (*remove_provider)(attribute_manager_t *this, void (*remove_provider)(attribute_manager_t *this,
attribute_provider_t *provider); attribute_provider_t *provider);
/** /**
* Destroy a attribute_manager instance. * Destroy a attribute_manager instance.
*/ */
void (*destroy)(attribute_manager_t *this); void (*destroy)(attribute_manager_t *this);
}; };
/** /**
+2 -2
View File
@@ -183,7 +183,7 @@ static void replace(auth_cfg_t *this, entry_enumerator_t *enumerator,
case AUTH_RULE_CRL_VALIDATION: case AUTH_RULE_CRL_VALIDATION:
case AUTH_RULE_OCSP_VALIDATION: case AUTH_RULE_OCSP_VALIDATION:
/* integer type */ /* integer type */
enumerator->current->value = (void*)va_arg(args, u_int); enumerator->current->value = (void*)(uintptr_t)va_arg(args, u_int);
break; break;
case AUTH_RULE_IDENTITY: case AUTH_RULE_IDENTITY:
case AUTH_RULE_EAP_IDENTITY: case AUTH_RULE_EAP_IDENTITY:
@@ -283,7 +283,7 @@ static void add(private_auth_cfg_t *this, auth_rule_t type, ...)
case AUTH_RULE_CRL_VALIDATION: case AUTH_RULE_CRL_VALIDATION:
case AUTH_RULE_OCSP_VALIDATION: case AUTH_RULE_OCSP_VALIDATION:
/* integer type */ /* integer type */
entry->value = (void*)va_arg(args, u_int); entry->value = (void*)(uintptr_t)va_arg(args, u_int);
break; break;
case AUTH_RULE_IDENTITY: case AUTH_RULE_IDENTITY:
case AUTH_RULE_EAP_IDENTITY: case AUTH_RULE_EAP_IDENTITY:
+1 -1
View File
@@ -643,7 +643,7 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
/** /**
* print all algorithms of a kind to buffer * print all algorithms of a kind to buffer
*/ */
static int print_alg(private_proposal_t *this, char **dst, int *len, static int print_alg(private_proposal_t *this, char **dst, size_t *len,
u_int kind, void *names, bool *first) u_int kind, void *names, bool *first)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
+2 -2
View File
@@ -56,7 +56,7 @@ struct rng_t {
* @param len number of bytes to get * @param len number of bytes to get
* @param buffer pointer where the generated bytes will be written * @param buffer pointer where the generated bytes will be written
*/ */
void (*get_bytes) (rng_t *this, u_int len, u_int8_t *buffer); void (*get_bytes) (rng_t *this, size_t len, u_int8_t *buffer);
/** /**
* Generates random bytes and allocate space for them. * Generates random bytes and allocate space for them.
@@ -64,7 +64,7 @@ struct rng_t {
* @param len number of bytes to get * @param len number of bytes to get
* @param chunk chunk which will hold generated bytes * @param chunk chunk which will hold generated bytes
*/ */
void (*allocate_bytes) (rng_t *this, u_int len, chunk_t *chunk); void (*allocate_bytes) (rng_t *this, size_t len, chunk_t *chunk);
/** /**
* Destroys a rng object. * Destroys a rng object.