reverted rule_count back to size_t, as it is passed as pointer (fixes 64bit issues)
authorMartin Willi <martin@strongswan.org>
Fri, 19 Jun 2009 08:01:04 +0000 (10:01 +0200)
committerMartin Willi <martin@strongswan.org>
Fri, 19 Jun 2009 08:01:04 +0000 (10:01 +0200)
src/charon/encoding/generator.c
src/charon/encoding/parser.c

index e610c1a..406cfc6 100644 (file)
@@ -484,12 +484,12 @@ static void write_to_chunk(private_generator_t *this,chunk_t *data)
  */
 static void generate_payload (private_generator_t *this,payload_t *payload)
 {
-       int i;
-       this->data_struct = payload;
-       int rule_count, offset_start;
+       int i, offset_start;
+       size_t rule_count;
        encoding_rule_t *rules;
        payload_type_t payload_type;
        
+       this->data_struct = payload;
        payload_type = payload->get_type(payload);
        /* spi size has to get reseted */
        this->last_spi_size = 0;
@@ -500,7 +500,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
                 payload_type_names, payload_type);
        
        /* each payload has its own encoding rules */
-       payload->get_encoding_rules(payload,&rules,&rule_count);
+       payload->get_encoding_rules(payload, &rules, &rule_count);
        
        for (i = 0; i < rule_count;i++)
        {
@@ -517,7 +517,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
                        case ATTRIBUTE_TYPE:
                        case CONFIGURATION_ATTRIBUTE_LENGTH:
                        {
-                               generate_u_int_type(this, rules[i].type,rules[i].offset);
+                               generate_u_int_type(this, rules[i].type, rules[i].offset);
                                break;
                        }
                        case RESERVED_BIT:
index 76ae32f..ac2b78c 100644 (file)
@@ -371,7 +371,8 @@ static status_t parse_payload(private_parser_t *this,
 {
        payload_t *pld;
        void *output;
-       int rule_count, payload_length = 0, spi_size = 0, attribute_length = 0;
+       size_t rule_count;
+       int payload_length = 0, spi_size = 0, attribute_length = 0;
        u_int16_t ts_type = 0;
        bool attribute_format = FALSE;
        int rule_number;
@@ -396,7 +397,7 @@ static status_t parse_payload(private_parser_t *this,
        output = pld;
        
        /* parse the payload with its own rulse */
-       pld->get_encoding_rules(pld, &(this->rules), &rule_count);
+       pld->get_encoding_rules(pld, &this->rules, &rule_count);
        for (rule_number = 0; rule_number < rule_count; rule_number++)
        {
                rule = &(this->rules[rule_number]);