1
1

Merge pull request #7291 from gpaulsen/topic/v4.0.x/from_pr7190_7192

Topic/v4.0.x/from pr7190 7192
Этот коммит содержится в:
Geoff Paulsen 2020-01-13 14:03:16 -06:00 коммит произвёл GitHub
родитель 8df9f53bdc 836ce83c9a
Коммит 6985a5560f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -142,7 +142,7 @@ bool opal_list_insert(opal_list_t *list, opal_list_item_t *item, long long idx)
#if OPAL_ENABLE_DEBUG
/* Spot check: ensure this item is only on the list that we
just insertted it into */
just inserted it into */
opal_atomic_add ( &(item->opal_list_item_refcount), 1 );
assert(1 == item->opal_list_item_refcount);

Просмотреть файл

@ -139,7 +139,7 @@ OPAL_DECLSPEC void opal_argv_free(char **argv);
* @retval argv pointer to new argv array on success
* @retval NULL on error
*
* All strings are insertted into the argv array by value; the
* All strings are inserted into the argv array by value; the
* newly-allocated array makes no references to the src_string
* argument (i.e., it can be freed after calling this function
* without invalidating the output argv).
@ -156,7 +156,7 @@ OPAL_DECLSPEC char **opal_argv_split(const char *src_string, int delimiter) __o
* @retval argv pointer to new argv array on success
* @retval NULL on error
*
* All strings are insertted into the argv array by value; the
* All strings are inserted into the argv array by value; the
* newly-allocated array makes no references to the src_string
* argument (i.e., it can be freed after calling this function
* without invalidating the output argv).
@ -259,7 +259,7 @@ OPAL_DECLSPEC int opal_argv_delete(int *argc, char ***argv,
* @retval OPAL_BAD_PARAM if any parameters are non-sensical
*
* This function takes one arg and inserts it in the middle of
* another. The first token in source will be insertted at index
* another. The first token in source will be inserted at index
* start in the target argv; all other tokens will follow it.
* Similar to opal_argv_append(), the target may be realloc()'ed
* to accomodate the new storage requirements.

Просмотреть файл

@ -383,7 +383,7 @@ int opal_cmd_line_parse(opal_cmd_line_t *cmd, bool ignore_unknown, bool ignore_u
/* Suck down the following parameters that belong to
this option. If we run out of parameters, or find
that any of them are the special_empty_param
(insertted by split_shorts()), then print an error
(inserted by split_shorts()), then print an error
and return. */
param = OBJ_NEW(ompi_cmd_line_param_t);

Просмотреть файл

@ -79,7 +79,7 @@ OPAL_DECLSPEC char **opal_environ_merge(char **minor, char **major) __opal_attri
*
* \em env is expected to be a NULL-terminated array of pointers
* (argv-style). Note that unlike some implementations of
* putenv(3), if \em value is insertted in \em env, it is copied.
* putenv(3), if \em value is inserted in \em env, it is copied.
* So the caller can modify/free both \em name and \em value after
* opal_setenv() returns.
*

Просмотреть файл

@ -298,7 +298,7 @@ char *opal_path_access(char *fname, char *path, int mode)
* Loads argument array with $PATH env var.
*
* Accepts
* -path String contiaing the $PATH
* -path String containing the $PATH
* -argc Pointer to argc
* -argv Pointer to list of argv
*/