1
1
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
2
2
/*
3
3
* 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
5
5
* and Technology (RIST). All rights reserved.
6
6
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
7
7
* Copyright (c) 2014 Mellanox Technologies, Inc.
@@ -209,7 +209,7 @@ int pmix1_server_register_nspace(opal_jobid_t jobid,
209
209
opal_pmix1_jobid_trkr_t * job ;
210
210
211
211
/* 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 );
213
213
214
214
/* store this job in our list of known nspaces */
215
215
job = OBJ_NEW (opal_pmix1_jobid_trkr_t );
@@ -295,7 +295,7 @@ int pmix1_server_register_client(const opal_process_name_t *proc,
295
295
op -> cbdata = cbdata ;
296
296
297
297
/* 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 );
299
299
op -> p .rank = proc -> vpid ;
300
300
301
301
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)
330
330
pmix_proc_t p ;
331
331
332
332
/* 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 );
334
334
p .rank = proc -> vpid ;
335
335
336
336
rc = PMIx_server_setup_fork (& p , env );
@@ -364,7 +364,7 @@ int pmix1_server_dmodex(const opal_process_name_t *proc,
364
364
op -> cbdata = cbdata ;
365
365
366
366
/* 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 );
368
368
op -> p .rank = proc -> vpid ;
369
369
370
370
/* find the internally-cached data for this proc */
@@ -395,7 +395,7 @@ int pmix1_server_notify_error(int status,
395
395
PMIX_PROC_CREATE (ps , psz );
396
396
n = 0 ;
397
397
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 );
399
399
ps [n ].rank = (int )nm -> name .vpid ;
400
400
++ n ;
401
401
}
@@ -408,7 +408,7 @@ int pmix1_server_notify_error(int status,
408
408
PMIX_PROC_CREATE (eps , esz );
409
409
n = 0 ;
410
410
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 );
412
412
eps [n ].rank = (int )nm -> name .vpid ;
413
413
++ n ;
414
414
}
0 commit comments