[hipl-commit] [trunk] Rev 4622: hipd: fix shadowing issue in the input code.

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

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

Log:
  hipd: fix shadowing issue in the input code.

Modified:
  M  hipd/input.c

=== modified file 'hipd/input.c'
--- hipd/input.c        2010-05-26 10:28:47 +0000
+++ hipd/input.c        2010-05-30 16:10:28 +0000
@@ -864,17 +864,17 @@
     /* Solve puzzle: if this is a retransmission, we have to preserve
      * the old solution. */
     if (!retransmission) {
-        struct hip_puzzle *pz = NULL;
+        struct hip_puzzle *pz2 = NULL;
 
-        HIP_IFEL(!(pz = hip_get_param(ctx->input_msg, HIP_PARAM_PUZZLE)), 
-EINVAL,
+        HIP_IFEL(!(pz2 = hip_get_param(ctx->input_msg, HIP_PARAM_PUZZLE)), 
-EINVAL,
                  "Malformed R1 packet. PUZZLE parameter missing\n");
-        HIP_IFEL((solved_puzzle = hip_solve_puzzle(pz,
+        HIP_IFEL((solved_puzzle = hip_solve_puzzle(pz2,
                                                    ctx->input_msg,
                                                    HIP_SOLVE_PUZZLE)) == 0,
                                                    -EINVAL, "Solving of puzzle 
failed\n");
-        I = pz->I;
+        I = pz2->I;
         ctx->hadb_entry->puzzle_solution = solved_puzzle;
-        ctx->hadb_entry->puzzle_i        = pz->I;
+        ctx->hadb_entry->puzzle_i        = pz2->I;
     } else {
         I             = ctx->hadb_entry->puzzle_i;
         solved_puzzle = ctx->hadb_entry->puzzle_solution;

Other related posts:

  • » [hipl-commit] [trunk] Rev 4622: hipd: fix shadowing issue in the input code. - Mircea Gherzan