[hipl-commit] [trunk] Rev 4624: lib: fix a shadowing issue.

  • From: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Sun, 30 May 2010 19:22:25 +0300

Committer: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
Date: 30/05/2010 at 19:22:25
Revision: 4624
Revision-id: mircea.gherzan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  lib: fix a shadowing issue.

Modified:
  M  lib/core/message.c

=== modified file 'lib/core/message.c'
--- lib/core/message.c  2010-05-26 10:28:47 +0000
+++ lib/core/message.c  2010-05-30 16:20:44 +0000
@@ -685,13 +685,13 @@
  * @param  encap_hdr_size .
  * @return                .
  */
-int hip_read_control_msg_v6(int socket,
+int hip_read_control_msg_v6(int sockfd,
                             struct hip_packet_context *ctx,
                             int encap_hdr_size)
 {
     HIP_DEBUG("Receiving a message on raw HIP from IPv6/HIP socket "\
-              " (file descriptor: %d).\n", socket);
-    return hip_read_control_msg_all(socket, ctx, encap_hdr_size, 0);
+              " (file descriptor: %d).\n", sockfd);
+    return hip_read_control_msg_all(sockfd, ctx, encap_hdr_size, 0);
 }
 
 /**
@@ -705,11 +705,11 @@
  * @param  encap_hdr_size .
  * @return                .
  */
-int hip_read_control_msg_v4(int socket,
+int hip_read_control_msg_v4(int sockfd,
                             struct hip_packet_context *ctx,
                             int encap_hdr_size)
 {
     HIP_DEBUG("Receiving a message on raw HIP from IPv4/HIP socket "\
               " (file descriptor: %d).\n", socket);
-    return hip_read_control_msg_all(socket, ctx, encap_hdr_size, 1);
+    return hip_read_control_msg_all(sockfd, ctx, encap_hdr_size, 1);
 }

Other related posts:

  • » [hipl-commit] [trunk] Rev 4624: lib: fix a shadowing issue. - Mircea Gherzan