From 023a40e2036dbf01b22518db097a00e1df8e72ac Mon Sep 17 00:00:00 2001
From: Arne Goedeke <el@laramies.com>
Date: Wed, 2 Jul 2014 19:09:53 +0200
Subject: [PATCH] Interpreter: renamed some variables

When compiling without bytecode and with compilers without computed
goto, the variable p is always struct program *. Use addr for OPCODE_T *,
instead, to silence warnings.
---
 src/interpret_functions.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/interpret_functions.h b/src/interpret_functions.h
index d8cd89e95d..9a62d79554 100644
--- a/src/interpret_functions.h
+++ b/src/interpret_functions.h
@@ -2159,25 +2159,25 @@ OPCODE1_RETURN(F_CALL_LFUN_AND_RETURN , "call lfun & return", I_UPDATE_ALL, {
   });
 
 OPCODE1_JUMP(F_MARK_CALL_LFUN, "mark, call lfun" , I_UPDATE_ALL, {
-    LOCAL_VAR(PIKE_OPCODE_T *p);
+    LOCAL_VAR(PIKE_OPCODE_T *addr);
     JUMP_SET_TO_PC_AT_NEXT (Pike_fp->return_addr);
-    if((p = lower_mega_apply(0, Pike_fp->current_object,
+    if((addr = lower_mega_apply(0, Pike_fp->current_object,
                              (arg1+Pike_fp->context->identifier_level)))) {
       Pike_fp->flags |= PIKE_FRAME_RETURN_INTERNAL;
-      DO_JUMP_TO(p);
+      DO_JUMP_TO(addr);
     } else {
       DO_JUMP_TO_NEXT;
     }
   });
 
 OPCODE1_JUMP( F_MARK_CALL_LFUN_AND_POP , "mark, call lfun & pop", I_UPDATE_ALL, {
-    LOCAL_VAR(PIKE_OPCODE_T *p);
+    LOCAL_VAR(PIKE_OPCODE_T *addr);
     JUMP_SET_TO_PC_AT_NEXT (Pike_fp->return_addr);
-    if((p = lower_mega_apply(0, Pike_fp->current_object,
+    if((addr = lower_mega_apply(0, Pike_fp->current_object,
                              (arg1+Pike_fp->context->identifier_level) )))
     {
       Pike_fp->flags |= PIKE_FRAME_RETURN_INTERNAL | PIKE_FRAME_RETURN_POP;
-      DO_JUMP_TO(p);
+      DO_JUMP_TO(addr);
     }
     else
     {
@@ -2244,7 +2244,7 @@ OPCODE1_JUMP(F_CALL_OTHER,"call other", I_UPDATE_ALL, {
   {
     LOCAL_VAR(struct svalue tmp);
     LOCAL_VAR(struct svalue tmp2);
-    LOCAL_VAR(PIKE_OPCODE_T *p);
+    LOCAL_VAR(PIKE_OPCODE_T *addr);
     SET_SVAL(tmp, PIKE_T_STRING, 1, string,
 	     Pike_fp->context->prog->strings[arg1]);
 
@@ -2253,10 +2253,10 @@ OPCODE1_JUMP(F_CALL_OTHER,"call other", I_UPDATE_ALL, {
     move_svalue (s, &tmp2);
     print_return_value();
 
-    if((p = low_mega_apply(APPLY_STACK, args, 0, 0)))
+    if((addr = low_mega_apply(APPLY_STACK, args, 0, 0)))
     {
       Pike_fp->flags |= PIKE_FRAME_RETURN_INTERNAL;
-      DO_JUMP_TO(p);
+      DO_JUMP_TO(addr);
     }
     else {
       DO_JUMP_TO_NEXT;
@@ -2304,7 +2304,7 @@ OPCODE1_JUMP(F_CALL_OTHER_AND_POP,"call other & pop", I_UPDATE_ALL, {
   {
     LOCAL_VAR(struct svalue tmp);
     LOCAL_VAR(struct svalue tmp2);
-    LOCAL_VAR(PIKE_OPCODE_T *p);
+    LOCAL_VAR(PIKE_OPCODE_T *addr);
 
     SET_SVAL(tmp, PIKE_T_STRING, 1, string,
 	     Pike_fp->context->prog->strings[arg1]);
@@ -2314,10 +2314,10 @@ OPCODE1_JUMP(F_CALL_OTHER_AND_POP,"call other & pop", I_UPDATE_ALL, {
     move_svalue (s, &tmp2);
     print_return_value();
 
-    if((p = low_mega_apply(APPLY_STACK, args, 0, 0)))
+    if((addr = low_mega_apply(APPLY_STACK, args, 0, 0)))
     {
       Pike_fp->flags |= PIKE_FRAME_RETURN_INTERNAL | PIKE_FRAME_RETURN_POP;
-      DO_JUMP_TO(p);
+      DO_JUMP_TO(addr);
     }
     else {
       pop_stack();
@@ -2364,7 +2364,7 @@ OPCODE1_RETURN(F_CALL_OTHER_AND_RETURN,"call other & return", I_UPDATE_ALL, {
   {
     LOCAL_VAR(struct svalue tmp);
     LOCAL_VAR(struct svalue tmp2);
-    LOCAL_VAR(PIKE_OPCODE_T *p);
+    LOCAL_VAR(PIKE_OPCODE_T *addr);
     SET_SVAL(tmp, PIKE_T_STRING, 1, string,
 	     Pike_fp->context->prog->strings[arg1]);
 
@@ -2373,11 +2373,11 @@ OPCODE1_RETURN(F_CALL_OTHER_AND_RETURN,"call other & return", I_UPDATE_ALL, {
     move_svalue (s, &tmp2);
     print_return_value();
 
-    if((p = low_mega_apply(APPLY_STACK, args, 0, 0)))
+    if((addr = low_mega_apply(APPLY_STACK, args, 0, 0)))
     {
       DO_IF_DEBUG(Pike_fp->next->pc=0);
       unlink_previous_frame();
-      DO_JUMP_TO(p);
+      DO_JUMP_TO(addr);
     }
     DO_DUMB_RETURN;
   }
-- 
GitLab