Skip to content

Commit 14db7c3

Browse files
jsquyresjsquyres
committed
Merge pull request open-mpi#1141 from jjhursey/topic/pmix-comment-fix
pmix/pmix112: Fix comments
2 parents 81e0924 + 599a135 commit 14db7c3

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎opal/mca/pmix/pmix112/pmix/src/buffer_ops/internal.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ BEGIN_C_DECLS
8787
#endif
8888

8989
/*
90-
* Internal type corresponding to pmix_status_t and unsigned int. Do not use
91-
* this in interface calls - use PMIX_pmix_status_t / PMIX_Upmix_status_t instead.
90+
* Internal type corresponding to int and unsigned int. Do not use
91+
* this in interface calls - use PMIX_INT / PMIX_UINT instead.
9292
*/
9393
#if SIZEOF_INT == 1
9494
#define BFROP_TYPE_INT PMIX_INT8
@@ -185,7 +185,7 @@ typedef struct {
185185
pmix_bfrop_unpack_fn_t odti_unpack_fn;
186186
/** copy function */
187187
pmix_bfrop_copy_fn_t odti_copy_fn;
188-
/** prpmix_status_t function */
188+
/** print function */
189189
pmix_bfrop_print_fn_t odti_print_fn;
190190
} pmix_bfrop_type_info_t;
191191
PMIX_DECLSPEC PMIX_CLASS_DECLARATION(pmix_bfrop_type_info_t);
@@ -402,7 +402,7 @@ pmix_status_t pmix_bfrop_copy_pdata(pmix_pdata_t **dest, pmix_pdata_t *src,
402402
pmix_data_type_t type);
403403

404404
/*
405-
* Internal prpmix_status_t functions
405+
* Internal print functions
406406
*/
407407
pmix_status_t pmix_bfrop_print_bool(char **output, char *prefix, bool *src, pmix_data_type_t type);
408408
pmix_status_t pmix_bfrop_print_byte(char **output, char *prefix, uint8_t *src, pmix_data_type_t type);

‎opal/mca/pmix/pmix112/pmix/src/buffer_ops/print.c‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pmix_status_t pmix_bfrop_print(char **output, char *prefix, void *src, pmix_data
3838
return PMIX_ERR_BAD_PARAM;
3939
}
4040

41-
/* Lookup the prpmix_status_t function for this type and call it */
41+
/* Lookup the print function for this type and call it */
4242

4343
if(NULL == (info = (pmix_bfrop_type_info_t*)pmix_pointer_array_get_item(&pmix_bfrop_types, type))) {
4444
return PMIX_ERR_UNKNOWN_DATA_TYPE;
@@ -48,7 +48,7 @@ pmix_status_t pmix_bfrop_print(char **output, char *prefix, void *src, pmix_data
4848
}
4949

5050
/*
51-
* STANDARD PRpmix_status_t FUNCTIONS FOR SYSTEM TYPES
51+
* STANDARD print FUNCTIONS FOR SYSTEM TYPES
5252
*/
5353
pmix_status_t pmix_bfrop_print_bool(char **output, char *prefix, bool *src, pmix_data_type_t type)
5454
{
@@ -58,7 +58,7 @@ pmix_status_t pmix_bfrop_print_bool(char **output, char *prefix, bool *src, pmix
5858
if (NULL == prefix) asprintf(&prefx, " ");
5959
else prefx = prefix;
6060

61-
/* if src is NULL, just prpmix_status_t data type and return */
61+
/* if src is NULL, just print data type and return */
6262
if (NULL == src) {
6363
asprintf(output, "%sData type: PMIX_BOOL\tValue: NULL pointer", prefx);
6464
if (prefx != prefix) {
@@ -84,7 +84,7 @@ pmix_status_t pmix_bfrop_print_byte(char **output, char *prefix, uint8_t *src, p
8484
if (NULL == prefix) asprintf(&prefx, " ");
8585
else prefx = prefix;
8686

87-
/* if src is NULL, just prpmix_status_t data type and return */
87+
/* if src is NULL, just print data type and return */
8888
if (NULL == src) {
8989
asprintf(output, "%sData type: PMIX_BYTE\tValue: NULL pointer", prefx);
9090
if (prefx != prefix) {
@@ -109,7 +109,7 @@ pmix_status_t pmix_bfrop_print_string(char **output, char *prefix, char *src, pm
109109
if (NULL == prefix) asprintf(&prefx, " ");
110110
else prefx = prefix;
111111

112-
/* if src is NULL, just prpmix_status_t data type and return */
112+
/* if src is NULL, just print data type and return */
113113
if (NULL == src) {
114114
asprintf(output, "%sData type: PMIX_STRING\tValue: NULL pointer", prefx);
115115
if (prefx != prefix) {
@@ -134,7 +134,7 @@ pmix_status_t pmix_bfrop_print_size(char **output, char *prefix, size_t *src, pm
134134
if (NULL == prefix) asprintf(&prefx, " ");
135135
else prefx = prefix;
136136

137-
/* if src is NULL, just prpmix_status_t data type and return */
137+
/* if src is NULL, just print data type and return */
138138
if (NULL == src) {
139139
asprintf(output, "%sData type: PMIX_SIZE\tValue: NULL pointer", prefx);
140140
if (prefx != prefix) {
@@ -159,7 +159,7 @@ pmix_status_t pmix_bfrop_print_pid(char **output, char *prefix, pid_t *src, pmix
159159
if (NULL == prefix) asprintf(&prefx, " ");
160160
else prefx = prefix;
161161

162-
/* if src is NULL, just prpmix_status_t data type and return */
162+
/* if src is NULL, just print data type and return */
163163
if (NULL == src) {
164164
asprintf(output, "%sData type: PMIX_PID\tValue: NULL pointer", prefx);
165165
if (prefx != prefix) {
@@ -183,7 +183,7 @@ pmix_status_t pmix_bfrop_print_int(char **output, char *prefix, int *src, pmix_d
183183
if (NULL == prefix) asprintf(&prefx, " ");
184184
else prefx = prefix;
185185

186-
/* if src is NULL, just prpmix_status_t data type and return */
186+
/* if src is NULL, just print data type and return */
187187
if (NULL == src) {
188188
asprintf(output, "%sData type: PMIX_INT\tValue: NULL pointer", prefx);
189189
if (prefx != prefix) {
@@ -208,7 +208,7 @@ pmix_status_t pmix_bfrop_print_uint(char **output, char *prefix, uint *src, pmix
208208
if (NULL == prefix) asprintf(&prefx, " ");
209209
else prefx = prefix;
210210

211-
/* if src is NULL, just prpmix_status_t data type and return */
211+
/* if src is NULL, just print data type and return */
212212
if (NULL == src) {
213213
asprintf(output, "%sData type: PMIX_UINT\tValue: NULL pointer", prefx);
214214
if (prefx != prefix) {
@@ -233,7 +233,7 @@ pmix_status_t pmix_bfrop_print_uint8(char **output, char *prefix, uint8_t *src,
233233
if (NULL == prefix) asprintf(&prefx, " ");
234234
else prefx = prefix;
235235

236-
/* if src is NULL, just prpmix_status_t data type and return */
236+
/* if src is NULL, just print data type and return */
237237
if (NULL == src) {
238238
asprintf(output, "%sData type: PMIX_UINT8\tValue: NULL pointer", prefx);
239239
if (prefx != prefix) {
@@ -258,7 +258,7 @@ pmix_status_t pmix_bfrop_print_uint16(char **output, char *prefix, uint16_t *src
258258
if (NULL == prefix) asprintf(&prefx, " ");
259259
else prefx = prefix;
260260

261-
/* if src is NULL, just prpmix_status_t data type and return */
261+
/* if src is NULL, just print data type and return */
262262
if (NULL == src) {
263263
asprintf(output, "%sData type: PMIX_UINT16\tValue: NULL pointer", prefx);
264264
if (prefx != prefix) {
@@ -284,7 +284,7 @@ pmix_status_t pmix_bfrop_print_uint32(char **output, char *prefix,
284284
if (NULL == prefix) asprintf(&prefx, " ");
285285
else prefx = prefix;
286286

287-
/* if src is NULL, just prpmix_status_t data type and return */
287+
/* if src is NULL, just print data type and return */
288288
if (NULL == src) {
289289
asprintf(output, "%sData type: PMIX_UINT32\tValue: NULL pointer", prefx);
290290
if (prefx != prefix) {
@@ -310,7 +310,7 @@ pmix_status_t pmix_bfrop_print_int8(char **output, char *prefix,
310310
if (NULL == prefix) asprintf(&prefx, " ");
311311
else prefx = prefix;
312312

313-
/* if src is NULL, just prpmix_status_t data type and return */
313+
/* if src is NULL, just print data type and return */
314314
if (NULL == src) {
315315
asprintf(output, "%sData type: PMIX_INT8\tValue: NULL pointer", prefx);
316316
if (prefx != prefix) {
@@ -336,7 +336,7 @@ pmix_status_t pmix_bfrop_print_int16(char **output, char *prefix,
336336
if (NULL == prefix) asprintf(&prefx, " ");
337337
else prefx = prefix;
338338

339-
/* if src is NULL, just prpmix_status_t data type and return */
339+
/* if src is NULL, just print data type and return */
340340
if (NULL == src) {
341341
asprintf(output, "%sData type: PMIX_INT16\tValue: NULL pointer", prefx);
342342
if (prefx != prefix) {
@@ -361,7 +361,7 @@ pmix_status_t pmix_bfrop_print_int32(char **output, char *prefix, int32_t *src,
361361
if (NULL == prefix) asprintf(&prefx, " ");
362362
else prefx = prefix;
363363

364-
/* if src is NULL, just prpmix_status_t data type and return */
364+
/* if src is NULL, just print data type and return */
365365
if (NULL == src) {
366366
asprintf(output, "%sData type: PMIX_INT32\tValue: NULL pointer", prefx);
367367
if (prefx != prefix) {
@@ -387,7 +387,7 @@ pmix_status_t pmix_bfrop_print_uint64(char **output, char *prefix,
387387
if (NULL == prefix) asprintf(&prefx, " ");
388388
else prefx = prefix;
389389

390-
/* if src is NULL, just prpmix_status_t data type and return */
390+
/* if src is NULL, just print data type and return */
391391
if (NULL == src) {
392392
asprintf(output, "%sData type: PMIX_UINT64\tValue: NULL pointer", prefx);
393393
if (prefx != prefix) {
@@ -414,7 +414,7 @@ pmix_status_t pmix_bfrop_print_int64(char **output, char *prefix,
414414
if (NULL == prefix) asprintf(&prefx, " ");
415415
else prefx = prefix;
416416

417-
/* if src is NULL, just prpmix_status_t data type and return */
417+
/* if src is NULL, just print data type and return */
418418
if (NULL == src) {
419419
asprintf(output, "%sData type: PMIX_INT64\tValue: NULL pointer", prefx);
420420
if (prefx != prefix) {
@@ -440,7 +440,7 @@ pmix_status_t pmix_bfrop_print_float(char **output, char *prefix,
440440
if (NULL == prefix) asprintf(&prefx, " ");
441441
else prefx = prefix;
442442

443-
/* if src is NULL, just prpmix_status_t data type and return */
443+
/* if src is NULL, just print data type and return */
444444
if (NULL == src) {
445445
asprintf(output, "%sData type: PMIX_FLOAT\tValue: NULL pointer", prefx);
446446
if (prefx != prefix) {
@@ -466,7 +466,7 @@ pmix_status_t pmix_bfrop_print_double(char **output, char *prefix,
466466
if (NULL == prefix) asprintf(&prefx, " ");
467467
else prefx = prefix;
468468

469-
/* if src is NULL, just prpmix_status_t data type and return */
469+
/* if src is NULL, just print data type and return */
470470
if (NULL == src) {
471471
asprintf(output, "%sData type: PMIX_DOUBLE\tValue: NULL pointer", prefx);
472472
if (prefx != prefix) {
@@ -493,7 +493,7 @@ pmix_status_t pmix_bfrop_print_time(char **output, char *prefix,
493493
if (NULL == prefix) asprintf(&prefx, " ");
494494
else prefx = prefix;
495495

496-
/* if src is NULL, just prpmix_status_t data type and return */
496+
/* if src is NULL, just print data type and return */
497497
if (NULL == src) {
498498
asprintf(output, "%sData type: PMIX_TIME\tValue: NULL pointer", prefx);
499499
if (prefx != prefix) {
@@ -522,7 +522,7 @@ pmix_status_t pmix_bfrop_print_timeval(char **output, char *prefix,
522522
if (NULL == prefix) asprintf(&prefx, " ");
523523
else prefx = prefix;
524524

525-
/* if src is NULL, just prpmix_status_t data type and return */
525+
/* if src is NULL, just print data type and return */
526526
if (NULL == src) {
527527
asprintf(output, "%sData type: PMIX_TIMEVAL\tValue: NULL pointer", prefx);
528528
if (prefx != prefix) {
@@ -540,7 +540,7 @@ pmix_status_t pmix_bfrop_print_timeval(char **output, char *prefix,
540540
return PMIX_SUCCESS;
541541
}
542542

543-
/* PRpmix_status_t FUNCTIONS FOR GENERIC PMIX TYPES */
543+
/* PRINT FUNCTIONS FOR GENERIC PMIX TYPES */
544544

545545
/*
546546
* PMIX_VALUE
@@ -554,7 +554,7 @@ pmix_status_t pmix_bfrop_print_value(char **output, char *prefix,
554554
if (NULL == prefix) asprintf(&prefx, " ");
555555
else prefx = prefix;
556556

557-
/* if src is NULL, just prpmix_status_t data type and return */
557+
/* if src is NULL, just print data type and return */
558558
if (NULL == src) {
559559
asprintf(output, "%sData type: PMIX_VALUE\tValue: NULL pointer", prefx);
560560
if (prefx != prefix) {
@@ -738,19 +738,19 @@ static void print_hwloc_obj(char **output, char *prefix,
738738
unsigned i;
739739
struct hwloc_topology_support *support;
740740

741-
/* prpmix_status_t the object type */
741+
/* print the object type */
742742
hwloc_obj_type_snprintf(string, 1024, obj, 1);
743743
asprintf(&pfx, "\n%s\t", (NULL == prefix) ? "" : prefix);
744744
asprintf(&tmp, "%sType: %s Number of child objects: %u%sName=%s",
745745
(NULL == prefix) ? "" : prefix, string, obj->arity,
746746
pfx, (NULL == obj->name) ? "NULL" : obj->name);
747747
if (0 < hwloc_obj_attr_snprintf(string, 1024, obj, pfx, 1)) {
748-
/* prpmix_status_t the attributes */
748+
/* print the attributes */
749749
asprintf(&tmp2, "%s%s%s", tmp, pfx, string);
750750
free(tmp);
751751
tmp = tmp2;
752752
}
753-
/* prpmix_status_t the cpusets - apparently, some new HWLOC types don't
753+
/* print the cpusets - apparently, some new HWLOC types don't
754754
* have cpusets, so protect ourselves here
755755
*/
756756
if (NULL != obj->cpuset) {
@@ -791,7 +791,7 @@ static void print_hwloc_obj(char **output, char *prefix,
791791
asprintf(&pfx, "%s\t", (NULL == prefix) ? "" : prefix);
792792
for (i=0; i < obj->arity; i++) {
793793
obj2 = obj->children[i];
794-
/* prpmix_status_t the object */
794+
/* print the object */
795795
print_hwloc_obj(&tmp2, pfx, topo, obj2);
796796
}
797797
free(pfx);
@@ -809,7 +809,7 @@ pmix_status_t pmix_bfrop_print_topo(char **output, char *prefix,
809809

810810
/* get root object */
811811
obj = hwloc_get_root_obj(src);
812-
/* prpmix_status_t it */
812+
/* print it */
813813
print_hwloc_obj(&tmp, prefix, src, obj);
814814
*output = tmp;
815815
return PMIX_SUCCESS;
@@ -831,7 +831,7 @@ pmix_status_t pmix_bfrop_print_persist(char **output, char *prefix, pmix_persist
831831
if (NULL == prefix) asprintf(&prefx, " ");
832832
else prefx = prefix;
833833

834-
/* if src is NULL, just prpmix_status_t data type and return */
834+
/* if src is NULL, just print data type and return */
835835
if (NULL == src) {
836836
asprintf(output, "%sData type: PMIX_PERSIST\tValue: NULL pointer", prefx);
837837
if (prefx != prefix) {
@@ -857,7 +857,7 @@ pmix_status_t pmix_bfrop_print_bo(char **output, char *prefix,
857857
if (NULL == prefix) asprintf(&prefx, " ");
858858
else prefx = prefix;
859859

860-
/* if src is NULL, just prpmix_status_t data type and return */
860+
/* if src is NULL, just print data type and return */
861861
if (NULL == src) {
862862
asprintf(output, "%sData type: PMIX_BYTE_OBJECT\tValue: NULL pointer", prefx);
863863
if (prefx != prefix) {

0 commit comments

Comments
 (0)