more changes to merge with current master

This commit is contained in:
Steve Plimpton
2021-08-17 14:03:58 -06:00
parent 96280dc185
commit 2bf9fa91db
8 changed files with 202 additions and 300 deletions

View File

@ -609,13 +609,12 @@ int utils::expand_args(const char *file, int line, int narg, char **arg, int mod
// only match custom array reference with a '*' wildcard
// number range in the first pair of square brackets
// OLDSTYLE code
if (strncmp(arg[iarg],"i2_",3) == 0 || strncmp(arg[iarg],"d2_",3) == 0) {
ptr1 = strchr(arg[iarg],'[');
char *ptr1 = strchr(arg[iarg],'[');
if (ptr1) {
ptr2 = strchr(ptr1,']');
char *ptr2 = strchr(ptr1,']');
if (ptr2) {
*ptr2 = '\0';
if (strchr(ptr1,'*')) {