@@ -220,8 +220,7 @@ pcmk_resource_t *
220220pe__create_clone_child (pcmk_resource_t * rsc , pcmk_scheduler_t * scheduler )
221221{
222222 bool removed = false;
223- char * inc_num = NULL ;
224- char * inc_max = NULL ;
223+ char * max_instances = NULL ;
225224 pcmk_resource_t * child_rsc = NULL ;
226225 xmlNode * child_copy = NULL ;
227226 clone_variant_data_t * clone_data = NULL ;
@@ -237,13 +236,11 @@ pe__create_clone_child(pcmk_resource_t *rsc, pcmk_scheduler_t *scheduler)
237236 removed = true;
238237 }
239238
240- // Allocate instance numbers in numerical order (starting at 0)
241- inc_num = pcmk__itoa (clone_data -> total_clones );
242- inc_max = pcmk__itoa (clone_data -> clone_max );
243-
244239 // Set PCMK__META_CLONE in a copy, not the original element
245240 child_copy = pcmk__xml_copy (NULL , clone_data -> xml_obj_child );
246- pcmk__xe_set (child_copy , PCMK__META_CLONE , inc_num );
241+
242+ // Allocate instance numbers in numerical order (starting at 0)
243+ pcmk__xe_set_int (child_copy , PCMK__META_CLONE , clone_data -> total_clones );
247244
248245 if (pe__unpack_resource (child_copy , & child_rsc , rsc ,
249246 scheduler ) != pcmk_rc_ok ) {
@@ -260,14 +257,13 @@ pe__create_clone_child(pcmk_resource_t *rsc, pcmk_scheduler_t *scheduler)
260257 pe__set_resource_flags_recursive (child_rsc , pcmk__rsc_removed );
261258 }
262259
263- pcmk__insert_meta (child_rsc -> priv , PCMK_META_CLONE_MAX , inc_max );
260+ max_instances = pcmk__itoa (clone_data -> clone_max );
261+ pcmk__insert_meta (child_rsc -> priv , PCMK_META_CLONE_MAX , max_instances );
264262 pcmk__rsc_trace (rsc , "Added %s instance %s" , rsc -> id , child_rsc -> id );
265263
266- bail :
267- free (inc_num );
268- free (inc_max );
264+ bail :
265+ free (max_instances );
269266 pcmk__xml_free (child_copy );
270-
271267 return child_rsc ;
272268}
273269
0 commit comments