From: Andreas Steffen Date: Fri, 3 Dec 2010 10:26:13 +0000 (+0100) Subject: removed superfluous whitespace X-Git-Tag: 4.5.1~463 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=375dacca8e626aa712b2cc31d6213885eed523e4;p=thirdparty%2Fstrongswan.git removed superfluous whitespace --- diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_message.c b/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_message.c index dc43e29e35..cb744b7069 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_message.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_message.c @@ -48,7 +48,7 @@ struct private_pb_access_recommendation_message_t { * PB-TNC message type */ pb_tnc_msg_type_t type; - + /** * Access recommendation code */ @@ -71,7 +71,7 @@ METHOD(pb_tnc_message_t, get_encoding, chunk_t, { return this->encoding; } - + METHOD(pb_tnc_message_t, build, void, private_pb_access_recommendation_message_t *this) { @@ -96,9 +96,9 @@ METHOD(pb_tnc_message_t, process, status_t, if (this->encoding.len < ACCESS_RECOMMENDATION_MESSAGE_SIZE) { DBG1(DBG_TNC,"%N message is shorter than message size of %u bytes", - pb_tnc_msg_type_names, PB_MSG_ACCESS_RECOMMENDATION, + pb_tnc_msg_type_names, PB_MSG_ACCESS_RECOMMENDATION, ACCESS_RECOMMENDATION_MESSAGE_SIZE); - return FAILED; + return FAILED; } /* process message */ diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_message.c b/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_message.c index 41e2e67fb4..752a1623cf 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_message.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_message.c @@ -70,7 +70,7 @@ METHOD(pb_tnc_message_t, get_encoding, chunk_t, { return this->encoding; } - + METHOD(pb_tnc_message_t, build, void, private_pb_assessment_result_message_t *this) { @@ -93,9 +93,9 @@ METHOD(pb_tnc_message_t, process, status_t, if (this->encoding.len < ASSESSMENT_RESULT_MESSAGE_SIZE) { DBG1(DBG_TNC,"%N message is shorter than message size of %u bytes", - pb_tnc_msg_type_names, PB_MSG_ASSESSMENT_RESULT, + pb_tnc_msg_type_names, PB_MSG_ASSESSMENT_RESULT, ASSESSMENT_RESULT_MESSAGE_SIZE); - return FAILED; + return FAILED; } /* process message */ diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_error_message.c b/src/libcharon/plugins/tnccs_20/messages/pb_error_message.c index 48c9fad8c8..883facb0b7 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_error_message.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_error_message.c @@ -93,7 +93,7 @@ METHOD(pb_tnc_message_t, get_encoding, chunk_t, { return this->encoding; } - + METHOD(pb_tnc_message_t, build, void, private_pb_error_message_t *this) { @@ -101,7 +101,7 @@ METHOD(pb_tnc_message_t, build, void, /* build message header */ writer = tls_writer_create(ERROR_HEADER_SIZE); - writer->write_uint8 (writer, this->fatal ? + writer->write_uint8 (writer, this->fatal ? ERROR_FLAG_FATAL : ERROR_FLAG_NONE); writer->write_uint24(writer, this->vendor_id); writer->write_uint16(writer, this->error_code); @@ -109,21 +109,21 @@ METHOD(pb_tnc_message_t, build, void, /* create encoding by concatenating message header and message body */ free(this->encoding.ptr); - - if(this->error_parameters) + + if(this->error_parameters) { if(this->error_code == PB_ERROR_VERSION_NOT_SUPPORTED) { /* Bad version */ - writer->write_uint8(writer, this->error_parameters); + writer->write_uint8(writer, this->error_parameters); writer->write_uint8(writer, 2); /* Max version */ writer->write_uint8(writer, 2); /* Min version */ writer->write_uint8(writer, 0); /* Reserved */ } - else + else { /* Error parameters */ - writer->write_uint32(writer, this->error_parameters); + writer->write_uint32(writer, this->error_parameters); } } this->encoding = writer->get_buf(writer); @@ -143,7 +143,7 @@ METHOD(pb_tnc_message_t, process, status_t, { DBG1(DBG_TNC,"%N message is shorter than header size of %u bytes", pb_tnc_msg_type_names, PB_MSG_ERROR, ERROR_HEADER_SIZE); - return FAILED; + return FAILED; } /* process message header */ @@ -268,7 +268,7 @@ pb_tnc_message_t *pb_error_message_create_with_parameter(u_int32_t vendor_id, u_int32_t error_parameters) { private_pb_error_message_t *this; - + INIT(this, .public = { .pb_interface = { diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_error_message.h b/src/libcharon/plugins/tnccs_20/messages/pb_error_message.h index 987758b89e..b6a7d911ea 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_error_message.h +++ b/src/libcharon/plugins/tnccs_20/messages/pb_error_message.h @@ -75,16 +75,16 @@ struct pb_error_message_t { * Create a PB-Error message from parameters * * @param vendor_id Error Code Vendor ID - * @param error_code Error Code + * @param error_code Error Code */ pb_tnc_message_t* pb_error_message_create(u_int32_t vendor_id, - pb_tnc_error_code_t error_code); + pb_tnc_error_code_t error_code); /** * Create a PB-Error message from parameters * * @param vendor_id Error Code Vendor ID - * @param error_code Error Code - * @param error_parameters Error parameters + * @param error_code Error Code + * @param error_parameters Error parameters */ pb_tnc_message_t* pb_error_message_create_with_parameter(u_int32_t vendor_id, pb_tnc_error_code_t error_code, @@ -92,7 +92,7 @@ pb_tnc_message_t* pb_error_message_create_with_parameter(u_int32_t vendor_id, /** * Create an unprocessed PB-Error message from raw data * - * @param data PB-Error message data + * @param data PB-Error message data */ pb_tnc_message_t* pb_error_message_create_from_data(chunk_t data); diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_message.c b/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_message.c index da211f184c..7f126d991c 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_message.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_message.c @@ -45,7 +45,7 @@ struct private_pb_language_preference_message_t { * PB-TNC message type */ pb_tnc_msg_type_t type; - + /** * Language preference */ @@ -68,7 +68,7 @@ METHOD(pb_tnc_message_t, get_encoding, chunk_t, { return this->encoding; } - + METHOD(pb_tnc_message_t, build, void, private_pb_language_preference_message_t *this) { @@ -93,7 +93,7 @@ METHOD(pb_tnc_message_t, process, status_t, { /* process message */ reader = tls_reader_create(this->encoding); - reader->read_data(reader, this->encoding.len, + reader->read_data(reader, this->encoding.len, &this->language_preference); this->language_preference = chunk_clone(this->language_preference); reader->destroy(reader); diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_pa_message.c b/src/libcharon/plugins/tnccs_20/messages/pb_pa_message.c index 51d54e8200..0e52c295cd 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_pa_message.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_pa_message.c @@ -106,7 +106,7 @@ METHOD(pb_tnc_message_t, get_encoding, chunk_t, { return this->encoding; } - + METHOD(pb_tnc_message_t, build, void, private_pb_pa_message_t *this) { @@ -139,7 +139,7 @@ METHOD(pb_tnc_message_t, process, status_t, { DBG1(DBG_TNC,"%N message is shorter than header size of %u bytes", pb_tnc_msg_type_names, PB_MSG_PA, PB_PA_HEADER_SIZE); - return FAILED; + return FAILED; } /* process message header */ diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_message.c b/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_message.c index 5dcab033f5..dbe8f657c0 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_message.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_message.c @@ -51,22 +51,22 @@ struct private_pb_reason_string_message_t { * PB-TNC message type */ pb_tnc_msg_type_t type; - + /** * Reason string length */ u_int32_t reason_string_length; - + /** * Reason string */ chunk_t reason_string; - + /** * Language code length */ u_int8_t language_code_length; - + /** * Language code */ @@ -89,7 +89,7 @@ METHOD(pb_tnc_message_t, get_encoding, chunk_t, { return this->encoding; } - + METHOD(pb_tnc_message_t, build, void, private_pb_reason_string_message_t *this) { @@ -99,7 +99,7 @@ METHOD(pb_tnc_message_t, build, void, writer = tls_writer_create(REASON_STRING_HEADER_SIZE); writer->write_uint32(writer, this->reason_string_length); writer->write_data(writer, this->reason_string); - + writer->write_uint8(writer, this->language_code_length); writer->write_data(writer, this->language_code); @@ -117,16 +117,16 @@ METHOD(pb_tnc_message_t, process, status_t, if (this->encoding.len < REASON_STRING_HEADER_SIZE) { DBG1(DBG_TNC,"%N message is shorter than header size of %u bytes", - pb_tnc_msg_type_names, PB_MSG_REASON_STRING, + pb_tnc_msg_type_names, PB_MSG_REASON_STRING, REASON_STRING_HEADER_SIZE); - return FAILED; + return FAILED; } /* process message */ reader = tls_reader_create(this->encoding); reader->read_uint32(reader, &this->reason_string_length); reader->read_data(reader, this->reason_string_length, &this->reason_string); - + reader->read_uint8(reader, &this->language_code_length); reader->read_data(reader, this->language_code_length, &this->language_code); diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_message.h b/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_message.h index c7c9a311a6..cfbfce9799 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_message.h +++ b/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_message.h @@ -41,21 +41,21 @@ struct pb_reason_string_message_t { * @return Length of reason string */ chunk_t (*get_reason_string_length)(pb_reason_string_message_t *this); - + /** * Get Reason String * * @return Reason string */ chunk_t (*get_reason_string)(pb_reason_string_message_t *this); - + /** * Get Reason String Language Code Length * * @return Length of language code */ chunk_t (*get_language_code_length)(pb_reason_string_message_t *this); - + /** * Get Reason String Language Code * diff --git a/src/libstrongswan/asn1/asn1_parser.c b/src/libstrongswan/asn1/asn1_parser.c index 5c9be2c6fe..2a7a38a529 100644 --- a/src/libstrongswan/asn1/asn1_parser.c +++ b/src/libstrongswan/asn1/asn1_parser.c @@ -278,7 +278,7 @@ asn1_parser_t* asn1_parser_create(asn1Object_t const *objects, chunk_t blob) .set_flags = _set_flags, .success = _success, .destroy = _destroy, - }, + }, .objects = objects, .blobs[0] = blob, .line = -1,