11/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22/*
33 * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
4- * Copyright (c) 2014-2015 Research Organization for Information Science
4+ * Copyright (c) 2014-2016 Research Organization for Information Science
55 * and Technology (RIST). All rights reserved.
66 * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
77 * Copyright (c) 2014 Mellanox Technologies, Inc.
@@ -209,7 +209,7 @@ int pmix1_server_register_nspace(opal_jobid_t jobid,
209209 opal_pmix1_jobid_trkr_t * job ;
210210
211211 /* convert the jobid */
212- (void )snprintf (nspace , PMIX_MAX_NSLEN , opal_convert_jobid_to_string ( jobid ) );
212+ (void )opal_snprintf_jobid (nspace , PMIX_MAX_NSLEN , jobid );
213213
214214 /* store this job in our list of known nspaces */
215215 job = OBJ_NEW (opal_pmix1_jobid_trkr_t );
@@ -295,7 +295,7 @@ int pmix1_server_register_client(const opal_process_name_t *proc,
295295 op -> cbdata = cbdata ;
296296
297297 /* convert the jobid */
298- (void )strncpy (op -> p .nspace , opal_convert_jobid_to_string ( proc -> jobid ), PMIX_MAX_NSLEN );
298+ (void )opal_snprintf_jobid (op -> p .nspace , PMIX_MAX_NSLEN , proc -> jobid );
299299 op -> p .rank = proc -> vpid ;
300300
301301 rc = PMIx_server_register_client (& op -> p , uid , gid , server_object ,
@@ -330,7 +330,7 @@ int pmix1_server_setup_fork(const opal_process_name_t *proc, char ***env)
330330 pmix_proc_t p ;
331331
332332 /* convert the jobid */
333- (void )strncpy (p .nspace , opal_convert_jobid_to_string ( proc -> jobid ), PMIX_MAX_NSLEN );
333+ (void )opal_snprintf_jobid (p .nspace , PMIX_MAX_NSLEN , proc -> jobid );
334334 p .rank = proc -> vpid ;
335335
336336 rc = PMIx_server_setup_fork (& p , env );
@@ -364,7 +364,7 @@ int pmix1_server_dmodex(const opal_process_name_t *proc,
364364 op -> cbdata = cbdata ;
365365
366366 /* convert the jobid */
367- (void )strncpy (op -> p .nspace , opal_convert_jobid_to_string ( proc -> jobid ), PMIX_MAX_NSLEN );
367+ (void )opal_snprintf_jobid (op -> p .nspace , PMIX_MAX_NSLEN , proc -> jobid );
368368 op -> p .rank = proc -> vpid ;
369369
370370 /* find the internally-cached data for this proc */
@@ -395,7 +395,7 @@ int pmix1_server_notify_error(int status,
395395 PMIX_PROC_CREATE (ps , psz );
396396 n = 0 ;
397397 OPAL_LIST_FOREACH (nm , procs , opal_namelist_t ) {
398- (void )snprintf (ps [n ].nspace , PMIX_MAX_NSLEN , opal_convert_jobid_to_string ( nm -> name .jobid ) );
398+ (void )opal_snprintf_jobid (ps [n ].nspace , PMIX_MAX_NSLEN , nm -> name .jobid );
399399 ps [n ].rank = (int )nm -> name .vpid ;
400400 ++ n ;
401401 }
@@ -408,7 +408,7 @@ int pmix1_server_notify_error(int status,
408408 PMIX_PROC_CREATE (eps , esz );
409409 n = 0 ;
410410 OPAL_LIST_FOREACH (nm , error_procs , opal_namelist_t ) {
411- (void )snprintf (eps [n ].nspace , PMIX_MAX_NSLEN , opal_convert_jobid_to_string ( nm -> name .jobid ) );
411+ (void )opal_snprintf_jobid (eps [n ].nspace , PMIX_MAX_NSLEN , nm -> name .jobid );
412412 eps [n ].rank = (int )nm -> name .vpid ;
413413 ++ n ;
414414 }
0 commit comments