minor refactorings

tasks/task_patch.c

@@ -745,6 +745,7 @@ bool patch_content(
    bool allow_ups   = !is_bps_pref && !is_ips_pref;
    bool allow_ips   = !is_ups_pref && !is_bps_pref;
    bool allow_bps   = !is_ups_pref && !is_ips_pref;
+   int i = 1;
 
    if (    (unsigned)is_ips_pref
          + (unsigned)is_bps_pref
@@ -755,17 +756,18 @@ bool patch_content(
       return false;
    }
 
-   int i = 1;
-   while (     try_ips_patch(allow_ips, name_ips, buf, size)
-         || try_bps_patch(allow_bps, name_bps, buf, size)
-         || try_ups_patch(allow_ups, name_ups, buf, size))
+   for (i = 1; i < 10; i++)
    {
-        /* a valid patch file was found, switch to the next patch by changing the last char of the name string */
-        i++;
-        if(i==10) break;
-        name_ips[strlen(name_ips)-1] = '0'+i;
-        name_bps[strlen(name_bps)-1] = '0'+i;
-        name_ups[strlen(name_ups)-1] = '0'+i;
+      if ( !try_ips_patch(allow_ips, name_ips, buf, size)
+         && !try_bps_patch(allow_bps, name_bps, buf, size)
+         && !try_ups_patch(allow_ups, name_ups, buf, size))
+         break;
+
+      /* else a valid patch file was found, switch to the next patch by changing the last char of the name string */
+      i++;
+      name_ips[strlen(name_ips)-1] = '0'+i;
+      name_bps[strlen(name_bps)-1] = '0'+i;
+      name_ups[strlen(name_ups)-1] = '0'+i;
    }
 
    if( i == 1 )