@@ -376,47 +376,46 @@ pcmk__xml_patchset_versions(const xmlNode *patchset, int source[3],
376376static int
377377check_patchset_versions (const xmlNode * xml , const xmlNode * patchset )
378378{
379- int lpc = 0 ;
380379 bool changed = FALSE;
381380
382381 int current [] = { 0 , 0 , 0 };
383382 int source [] = { 0 , 0 , 0 };
384383 int target [] = { 0 , 0 , 0 };
385384 int rc = pcmk_rc_ok ;
386385
387- for (lpc = 0 ; lpc < PCMK__NELEM (vfields ); lpc ++ ) {
388- crm_element_value_int (xml , vfields [lpc ], & (current [lpc ]));
389- crm_trace ("Got %d for current[%s]" , current [lpc ], vfields [lpc ]);
390- if (current [lpc ] < 0 ) {
391- current [lpc ] = 0 ;
386+ for (int i = 0 ; i < PCMK__NELEM (vfields ); i ++ ) {
387+ crm_element_value_int (xml , vfields [i ], & (current [i ]));
388+ crm_trace ("Got %d for current[%s]" , current [i ], vfields [i ]);
389+ if (current [i ] < 0 ) {
390+ current [i ] = 0 ;
392391 }
393392 }
394393
395394 /* Set some defaults in case nothing is present */
396395 target [0 ] = current [0 ];
397396 target [1 ] = current [1 ];
398397 target [2 ] = current [2 ] + 1 ;
399- for (lpc = 0 ; lpc < PCMK__NELEM (vfields ); lpc ++ ) {
400- source [lpc ] = current [lpc ];
398+ for (int i = 0 ; i < PCMK__NELEM (vfields ); i ++ ) {
399+ source [i ] = current [i ];
401400 }
402401
403402 rc = pcmk__xml_patchset_versions (patchset , source , target );
404403 if (rc != pcmk_rc_ok ) {
405404 return rc ;
406405 }
407406
408- for (lpc = 0 ; lpc < PCMK__NELEM (vfields ); lpc ++ ) {
409- if (current [lpc ] < source [lpc ]) {
407+ for (int i = 0 ; i < PCMK__NELEM (vfields ); i ++ ) {
408+ if (current [i ] < source [i ]) {
410409 crm_debug ("Current %s is too low (%d.%d.%d < %d.%d.%d --> %d.%d.%d)" ,
411- vfields [lpc ],
410+ vfields [i ],
412411 current [0 ], current [1 ], current [2 ],
413412 source [0 ], source [1 ], source [2 ],
414413 target [0 ], target [1 ], target [2 ]);
415414 return pcmk_rc_diff_resync ;
416415
417- } else if (current [lpc ] > source [lpc ]) {
416+ } else if (current [i ] > source [i ]) {
418417 crm_info ("Current %s is too high (%d.%d.%d > %d.%d.%d --> %d.%d.%d) %p" ,
419- vfields [lpc ],
418+ vfields [i ],
420419 current [0 ], current [1 ], current [2 ],
421420 source [0 ], source [1 ], source [2 ],
422421 target [0 ], target [1 ], target [2 ], patchset );
@@ -425,8 +424,8 @@ check_patchset_versions(const xmlNode *xml, const xmlNode *patchset)
425424 }
426425 }
427426
428- for (lpc = 0 ; lpc < PCMK__NELEM (vfields ); lpc ++ ) {
429- if (target [lpc ] > source [lpc ]) {
427+ for (int i = 0 ; i < PCMK__NELEM (vfields ); i ++ ) {
428+ if (target [i ] > source [i ]) {
430429 changed = TRUE;
431430 }
432431 }
0 commit comments