[hipl-dev] [Branch ~hipl-core/hipl/mobility-fixes] Rev 5180: fix indentation and casting issues from previous commits
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Mon, 22 Nov 2010 14:06:35 -0000
------------------------------------------------------------
revno: 5180
committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
branch nick: mobility-fixes
timestamp: Mon 2010-11-22 15:03:57 +0100
message:
fix indentation and casting issues from previous commits
modified:
lib/core/builder.c
lib/core/builder.h
modules/update/hipd/update.c
modules/update/hipd/update_builder.c
modules/update/hipd/update_builder.h
--
lp:~hipl-core/hipl/mobility-fixes
https://code.launchpad.net/~hipl-core/hipl/mobility-fixes
Your team HIPL core team is subscribed to branch
lp:~hipl-core/hipl/mobility-fixes.
To unsubscribe from this branch go to
https://code.launchpad.net/~hipl-core/hipl/mobility-fixes/+edit-subscription
=== modified file 'lib/core/builder.c'
--- lib/core/builder.c 2010-11-19 17:37:09 +0000
+++ lib/core/builder.c 2010-11-22 14:03:57 +0000
@@ -1059,8 +1059,8 @@
* (in host byte order)
*/
void hip_calc_generic_param_len(struct hip_tlv_common *tlv_common,
- hip_tlv_len_t tlv_size,
- hip_tlv_len_t contents_size)
+ hip_tlv_len_t tlv_size,
+ hip_tlv_len_t contents_size)
{
hip_set_param_contents_len(tlv_common,
tlv_size + contents_size -
@@ -1079,7 +1079,7 @@
* (in host byte order)
*/
void hip_calc_param_len(struct hip_tlv_common *tlv_common,
- hip_tlv_len_t contents_size)
+ hip_tlv_len_t contents_size)
{
hip_calc_generic_param_len(tlv_common,
sizeof(struct hip_tlv_common),
=== modified file 'lib/core/builder.h'
--- lib/core/builder.h 2010-11-19 17:37:09 +0000
+++ lib/core/builder.h 2010-11-22 14:03:57 +0000
@@ -209,8 +209,8 @@
hip_tlv_type_t hip_get_param_type(const void *);
void hip_set_param_type(struct hip_tlv_common *tlv_generic, hip_tlv_type_t
type);
void hip_calc_generic_param_len(struct hip_tlv_common *tlv_common,
- hip_tlv_len_t tlv_size,
- hip_tlv_len_t contents_size);
+ hip_tlv_len_t tlv_size,
+ hip_tlv_len_t contents_size);
void hip_calc_param_len(struct hip_tlv_common *tlv_common,
hip_tlv_len_t contents_size);
uint16_t hip_get_msg_checksum(struct hip_common *msg);
=== modified file 'modules/update/hipd/update.c'
--- modules/update/hipd/update.c 2010-11-22 14:00:10 +0000
+++ modules/update/hipd/update.c 2010-11-22 14:03:57 +0000
@@ -659,7 +659,7 @@
struct hip_locator_info_addr_item *temp;
- temp = (struct hip_locator_info_addr_item *) item;
+ temp = item;
if (temp->locator_type == HIP_LOCATOR_LOCATOR_TYPE_ESP_SPI) {
return &temp->address;
} else if (temp->locator_type == HIP_LOCATOR_LOCATOR_TYPE_IPV6) {
=== modified file 'modules/update/hipd/update_builder.c'
--- modules/update/hipd/update_builder.c 2010-11-19 17:23:54 +0000
+++ modules/update/hipd/update_builder.c 2010-11-22 14:03:57 +0000
@@ -72,8 +72,7 @@
struct hip_ack ack;
hip_set_param_type((struct hip_tlv_common *) &ack, HIP_PARAM_ACK);
- hip_calc_param_len((struct hip_tlv_common *) &ack,
- sizeof(struct hip_ack));
+ hip_calc_param_len((struct hip_tlv_common *) &ack, sizeof(struct hip_ack));
ack.peer_update_id = htonl(peer_update_id);
err = hip_build_param(msg, &ack);
return err;
@@ -107,8 +106,6 @@
HIP_IFE(hip_build_param(msg, locator_info), -1);
out_err:
- if (locator_info) {
- free(locator_info);
- }
+ free(locator_info);
return err;
}
=== modified file 'modules/update/hipd/update_builder.h'
--- modules/update/hipd/update_builder.h 2010-11-19 17:23:54 +0000
+++ modules/update/hipd/update_builder.h 2010-11-22 14:03:57 +0000
@@ -35,8 +35,8 @@
#include "lib/core/protodefs.h"
-#ifndef MODULES_UPDATE_UPDATE_BUILDER_H_
-#define MODULES_UPDATE_UPDATE_BUILDER_H_
+#ifndef MODULES_UPDATE_HIPD_UPDATE_BUILDER_H
+#define MODULES_UPDATE_HIPD_UPDATE_BUILDER_H
int hip_build_param_seq(struct hip_common *msg, uint32_t update_id);
int hip_build_param_ack(struct hip_common *msg, uint32_t peer_update_id);
@@ -44,4 +44,4 @@
struct hip_locator_info_addr_item *addrs,
int addr_count);
-#endif /* UPDATE_BUILDER_H_ */
+#endif /* MODULES_UPDATE_HIPD_UPDATE_BUILDER_H */
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/mobility-fixes] Rev 5180: fix indentation and casting issues from previous commits - noreply
