* duh. fix previous commit so that we don't free NULL pointers and all that
This commit was SVN r3724.
Этот коммит содержится в:
родитель
a5cc10e799
Коммит
d51cfe0fc4
@ -292,18 +292,18 @@ int ompi_argv_delete(int *argc, char ***argv, int start, int num_to_delete)
|
|||||||
/* Free all items that are being deleted */
|
/* Free all items that are being deleted */
|
||||||
|
|
||||||
for (i = start; i < count && i < start + num_to_delete; ++i) {
|
for (i = start; i < count && i < start + num_to_delete; ++i) {
|
||||||
free(*argv[i]);
|
free((*argv)[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Copy the suffix over the deleted items */
|
/* Copy the suffix over the deleted items */
|
||||||
|
|
||||||
for (i = start; i < start + suffix_count; ++i) {
|
for (i = start; i < start + suffix_count; ++i) {
|
||||||
*argv[i] = *argv[i + num_to_delete];
|
(*argv)[i] = (*argv)[i + num_to_delete];
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Add the trailing NULL */
|
/* Add the trailing NULL */
|
||||||
|
|
||||||
*argv[i] = NULL;
|
(*argv)[i] = NULL;
|
||||||
|
|
||||||
/* adjust the argv array */
|
/* adjust the argv array */
|
||||||
tmp = realloc(*argv, sizeof(char**) * (i + 1));
|
tmp = realloc(*argv, sizeof(char**) * (i + 1));
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user