From 0da3d72174642da66a3370c8f661aa7e47925bf0 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Fri, 16 Jul 2010 12:57:24 +0100 Subject: [PATCH] generator: Don't hard-code name in DeviceList check. Only one function currently uses DeviceList. The generated code unfortunately hard-coded the argument name from that function. (cherry picked from commit aac51942aab63a9355ad6724345ea923148bf2a9) --- src/generator.ml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/generator.ml b/src/generator.ml index d640343..cb3f773 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -6484,9 +6484,12 @@ and generate_daemon_actions () = | DeviceList n -> pr_list_handling_code n; pr " /* Ensure that each is a device,\n"; - pr " * and perform device name translation. */\n"; - pr " { int pvi; for (pvi = 0; physvols[pvi] != NULL; ++pvi)\n"; - pr " RESOLVE_DEVICE (physvols[pvi], %s, goto done);\n" + pr " * and perform device name translation.\n"; + pr " */\n"; + pr " {\n"; + pr " int i;\n"; + pr " for (i = 0; %s[i] != NULL; ++i)\n" n; + pr " RESOLVE_DEVICE (%s[i], %s, goto done);\n" n (if is_filein then "cancel_receive ()" else "0"); pr " }\n"; | Bool n -> pr " %s = args.%s;\n" n n -- 1.8.3.1