Fixing the return code for parameter recovery:

All the CCTKi_BindingsParameterRecovery_XXX() routines return

 zero:         as the default value if they don't provide a scheduled parameter
               recovery routine, or if no recovery was requested
 less zero:    if the scheduled parameter recovery routine failed
               for some reason
 greater zero: successful recovery of parameters

CCTKi_BindingsParameterRecoveryInitialise() uses the same return codes and
immediately returns after the first successful recovery.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1592 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 12 insertions, 9 deletions

diff --git a/lib/sbin/CreateScheduleBindings.pl b/lib/sbin/CreateScheduleBindings.pl
index fca304d9..fa86e0de 100644
--- a/lib/sbin/CreateScheduleBindings.pl
+++ b/lib/sbin/CreateScheduleBindings.pl
@@ -286,7 +286,7 @@ sub ParameterRecoveryCreateFile
   $outbuf .=  "int CCTKi_BindingsParameterRecovery_$thorn(void)\n";
   $outbuf .=  "{\n";
   $outbuf .=  "  DECLARE_CCTK_PARAMETERS\n";
-  $outbuf .=  "  int result = -1;\n\n";
+  $outbuf .=  "  int result = 0;\n\n";
   $outbuf .=  "$buffer\n";
   $outbuf .=  "  return (result);\n";
   $outbuf .=  "  USE_CCTK_PARAMETERS\n";
@@ -411,20 +411,23 @@ sub ParameterRecoveryCreateBindings
   $outbuf .=  "int CCTKi_BindingsParameterRecoveryInitialise(void)\n";
   $outbuf .=  "{\n";
 
-  $outbuf .= "  int result = 0;\n";
+  $outbuf .= "  int result;\n";
+  $outbuf .= "  int retval = 0;\n\n";
   $outbuf .= "  do\n";
   $outbuf .= "  {\n";
   foreach $thorn (sort split(" ", $rhinterface_db->{"THORNS"}))
   {
-    $outbuf .= "  if(CCTK_IsThornActive(\"$thorn\"))\n";
-    $outbuf .= "  {\n";
-    $outbuf .= "    result=CCTKi_BindingsParameterRecovery_$thorn();\n";
-    $outbuf .= "    if (result == 0)\n";
-    $outbuf .= "      break;\n";
-    $outbuf .= "  }\n";
+    $outbuf .= "    if(CCTK_IsThornActive(\"$thorn\"))\n";
+    $outbuf .= "    {\n";
+    $outbuf .= "      result = CCTKi_BindingsParameterRecovery_$thorn();\n";
+    $outbuf .= "      if (result != 0)\n";
+    $outbuf .= "        retval = result;\n";
+    $outbuf .= "      if (retval > 0)\n";
+    $outbuf .= "        break;\n";
+    $outbuf .= "    }\n";
   }
   $outbuf .=  "  } while (0);\n";
-  $outbuf .=  "  return result;\n";
+  $outbuf .=  "  return retval;\n";
   $outbuf .=  "}\n";
   $outbuf .=  "\n";