| Message ID | 8f5f7822-44ee-168b-85aa-399ae3e09c90@dev.mellanox.co.il (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Ira Weiny |
| Headers | show |
<sigh> My servers have moved and apparently I can't access github from them. So I am unable to get Susans patch into my local repo to apply this patch. Hal could you send this as a pull request on github and I will accept it there. Github did not make the space vs tabs clear to me. I'll see if it was something I missed. Thanks, Ira > -----Original Message----- > From: Hal Rosenstock [mailto:hal@dev.mellanox.co.il] > Sent: Wednesday, March 14, 2018 11:13 AM > To: Weiny, Ira <ira.weiny@intel.com> > Cc: Coulter, Susan K <skc@lanl.gov>; linux-rdma@vger.kernel.org > Subject: [PATCH][TRIVIAL] infiniband-diags: Fix some formatting > > > Use leading tabs rather than leading spaces > > Introduced in: > commit 2ffe4ec09f0df9b4b4a80f9d6292fabebab0e5c9 > > Added check for successful strdup of node_name_map_file > > Signed-off-by: Hal Rosenstock <hal@mellanox.com> > --- > src/dump_fts.c | 4 ++-- > src/iblinkinfo.c | 4 ++-- > src/ibnetdiscover.c | 4 ++-- > src/ibqueryerrors.c | 4 ++-- > src/ibroute.c | 4 ++-- > src/ibtracert.c | 4 ++-- > src/saquery.c | 4 ++-- > src/smpquery.c | 4 ++-- > 8 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/src/dump_fts.c b/src/dump_fts.c index 932fc24..20abd24 100644 > --- a/src/dump_fts.c > +++ b/src/dump_fts.c > @@ -408,8 +408,8 @@ static int process_opt(void *context, int ch, char *optarg) > break; > case 1: > node_name_map_file = strdup(optarg); > - if (node_name_map_file == NULL) > - IBEXIT("out of memory, strdup for node_name_map_file name > failed"); > + if (node_name_map_file == NULL) > + IBEXIT("out of memory, strdup for > node_name_map_file name failed"); > break; > default: > return -1; > diff --git a/src/iblinkinfo.c b/src/iblinkinfo.c index 384d489..deccb09 100644 > --- a/src/iblinkinfo.c > +++ b/src/iblinkinfo.c > @@ -512,8 +512,8 @@ static int process_opt(void *context, int ch, char *optarg) > switch (ch) { > case 1: > node_name_map_file = strdup(optarg); > - if (node_name_map_file == NULL) > - IBEXIT("out of memory, strdup for node_name_map_file name > failed"); > + if (node_name_map_file == NULL) > + IBEXIT("out of memory, strdup for > node_name_map_file name failed"); > break; > case 2: > load_cache_file = strdup(optarg); > diff --git a/src/ibnetdiscover.c b/src/ibnetdiscover.c index ef0d7a0..0eef703 > 100644 > --- a/src/ibnetdiscover.c > +++ b/src/ibnetdiscover.c > @@ -995,8 +995,8 @@ static int process_opt(void *context, int ch, char *optarg) > switch (ch) { > case 1: > node_name_map_file = strdup(optarg); > - if (node_name_map_file == NULL) > - IBEXIT("out of memory, strdup for node_name_map_file name > failed"); > + if (node_name_map_file == NULL) > + IBEXIT("out of memory, strdup for > node_name_map_file name failed"); > break; > case 2: > cache_file = strdup(optarg); > diff --git a/src/ibqueryerrors.c b/src/ibqueryerrors.c index 5e49522..43b062a > 100644 > --- a/src/ibqueryerrors.c > +++ b/src/ibqueryerrors.c > @@ -909,8 +909,8 @@ static int process_opt(void *context, int ch, char *optarg) > break; > case 1: > node_name_map_file = strdup(optarg); > - if (node_name_map_file == NULL) > - IBEXIT("out of memory, strdup for node_name_map_file name > failed"); > + if (node_name_map_file == NULL) > + IBEXIT("out of memory, strdup for > node_name_map_file name failed"); > break; > case 2: > data_counters++; > diff --git a/src/ibroute.c b/src/ibroute.c index 8c165e6..2514073 100644 > --- a/src/ibroute.c > +++ b/src/ibroute.c > @@ -408,8 +408,8 @@ static int process_opt(void *context, int ch, char *optarg) > break; > case 1: > node_name_map_file = strdup(optarg); > - if (node_name_map_file == NULL) > - IBEXIT("out of memory, strdup for node_name_map_file name > failed"); > + if (node_name_map_file == NULL) > + IBEXIT("out of memory, strdup for > node_name_map_file name failed"); > break; > default: > return -1; > diff --git a/src/ibtracert.c b/src/ibtracert.c index 86816bf..1baeb5b 100644 > --- a/src/ibtracert.c > +++ b/src/ibtracert.c > @@ -759,8 +759,8 @@ static int process_opt(void *context, int ch, char *optarg) > switch (ch) { > case 1: > node_name_map_file = strdup(optarg); > - if (node_name_map_file == NULL) > - IBEXIT("out of memory, strdup for node_name_map_file name > failed"); > + if (node_name_map_file == NULL) > + IBEXIT("out of memory, strdup for > node_name_map_file name failed"); > break; > case 'm': > multicast++; > diff --git a/src/saquery.c b/src/saquery.c index 03fc779..1ce2f23 100644 > --- a/src/saquery.c > +++ b/src/saquery.c > @@ -1555,8 +1555,8 @@ static int process_opt(void *context, int ch, char > *optarg) > break; > case 3: > node_name_map_file = strdup(optarg); > - if (node_name_map_file == NULL) > - IBEXIT("out of memory, strdup for node_name_map_file name > failed"); > + if (node_name_map_file == NULL) > + IBEXIT("out of memory, strdup for > node_name_map_file name failed"); > break; > case 4: > if (!isxdigit(*optarg) && !(optarg = getpass("SM_Key: "))) { diff -- > git a/src/smpquery.c b/src/smpquery.c index 3bcc984..37461b8 100644 > --- a/src/smpquery.c > +++ b/src/smpquery.c > @@ -416,8 +416,8 @@ static int process_opt(void *context, int ch, char *optarg) > switch (ch) { > case 1: > node_name_map_file = strdup(optarg); > - if (node_name_map_file == NULL) > - IBEXIT("out of memory, strdup for node_name_map_file name > failed"); > + if (node_name_map_file == NULL) > + IBEXIT("out of memory, strdup for > node_name_map_file name failed"); > break; > case 'c': > ibd_dest_type = IB_DEST_DRSLID; > -- > 2.8.4
On 3/15/2018 12:01 PM, Weiny, Ira wrote: > <sigh> > > My servers have moved and apparently I can't access github from them. So I am unable to get Susans patch into my local repo to apply this patch. > > Hal could you send this as a pull request on github and I will accept it there. Done. > Github did not make the space vs tabs clear to me. I'll see if it was something I missed. github showed the first line of each change as unaligned to the existing previous line before the change due to this. -- Hal > Thanks, > Ira > > >> -----Original Message----- >> From: Hal Rosenstock [mailto:hal@dev.mellanox.co.il] >> Sent: Wednesday, March 14, 2018 11:13 AM >> To: Weiny, Ira <ira.weiny@intel.com> >> Cc: Coulter, Susan K <skc@lanl.gov>; linux-rdma@vger.kernel.org >> Subject: [PATCH][TRIVIAL] infiniband-diags: Fix some formatting >> >> >> Use leading tabs rather than leading spaces >> >> Introduced in: >> commit 2ffe4ec09f0df9b4b4a80f9d6292fabebab0e5c9 >> >> Added check for successful strdup of node_name_map_file >> >> Signed-off-by: Hal Rosenstock <hal@mellanox.com> >> --- >> src/dump_fts.c | 4 ++-- >> src/iblinkinfo.c | 4 ++-- >> src/ibnetdiscover.c | 4 ++-- >> src/ibqueryerrors.c | 4 ++-- >> src/ibroute.c | 4 ++-- >> src/ibtracert.c | 4 ++-- >> src/saquery.c | 4 ++-- >> src/smpquery.c | 4 ++-- >> 8 files changed, 16 insertions(+), 16 deletions(-) >> >> diff --git a/src/dump_fts.c b/src/dump_fts.c index 932fc24..20abd24 100644 >> --- a/src/dump_fts.c >> +++ b/src/dump_fts.c >> @@ -408,8 +408,8 @@ static int process_opt(void *context, int ch, char *optarg) >> break; >> case 1: >> node_name_map_file = strdup(optarg); >> - if (node_name_map_file == NULL) >> - IBEXIT("out of memory, strdup for node_name_map_file name >> failed"); >> + if (node_name_map_file == NULL) >> + IBEXIT("out of memory, strdup for >> node_name_map_file name failed"); >> break; >> default: >> return -1; >> diff --git a/src/iblinkinfo.c b/src/iblinkinfo.c index 384d489..deccb09 100644 >> --- a/src/iblinkinfo.c >> +++ b/src/iblinkinfo.c >> @@ -512,8 +512,8 @@ static int process_opt(void *context, int ch, char *optarg) >> switch (ch) { >> case 1: >> node_name_map_file = strdup(optarg); >> - if (node_name_map_file == NULL) >> - IBEXIT("out of memory, strdup for node_name_map_file name >> failed"); >> + if (node_name_map_file == NULL) >> + IBEXIT("out of memory, strdup for >> node_name_map_file name failed"); >> break; >> case 2: >> load_cache_file = strdup(optarg); >> diff --git a/src/ibnetdiscover.c b/src/ibnetdiscover.c index ef0d7a0..0eef703 >> 100644 >> --- a/src/ibnetdiscover.c >> +++ b/src/ibnetdiscover.c >> @@ -995,8 +995,8 @@ static int process_opt(void *context, int ch, char *optarg) >> switch (ch) { >> case 1: >> node_name_map_file = strdup(optarg); >> - if (node_name_map_file == NULL) >> - IBEXIT("out of memory, strdup for node_name_map_file name >> failed"); >> + if (node_name_map_file == NULL) >> + IBEXIT("out of memory, strdup for >> node_name_map_file name failed"); >> break; >> case 2: >> cache_file = strdup(optarg); >> diff --git a/src/ibqueryerrors.c b/src/ibqueryerrors.c index 5e49522..43b062a >> 100644 >> --- a/src/ibqueryerrors.c >> +++ b/src/ibqueryerrors.c >> @@ -909,8 +909,8 @@ static int process_opt(void *context, int ch, char *optarg) >> break; >> case 1: >> node_name_map_file = strdup(optarg); >> - if (node_name_map_file == NULL) >> - IBEXIT("out of memory, strdup for node_name_map_file name >> failed"); >> + if (node_name_map_file == NULL) >> + IBEXIT("out of memory, strdup for >> node_name_map_file name failed"); >> break; >> case 2: >> data_counters++; >> diff --git a/src/ibroute.c b/src/ibroute.c index 8c165e6..2514073 100644 >> --- a/src/ibroute.c >> +++ b/src/ibroute.c >> @@ -408,8 +408,8 @@ static int process_opt(void *context, int ch, char *optarg) >> break; >> case 1: >> node_name_map_file = strdup(optarg); >> - if (node_name_map_file == NULL) >> - IBEXIT("out of memory, strdup for node_name_map_file name >> failed"); >> + if (node_name_map_file == NULL) >> + IBEXIT("out of memory, strdup for >> node_name_map_file name failed"); >> break; >> default: >> return -1; >> diff --git a/src/ibtracert.c b/src/ibtracert.c index 86816bf..1baeb5b 100644 >> --- a/src/ibtracert.c >> +++ b/src/ibtracert.c >> @@ -759,8 +759,8 @@ static int process_opt(void *context, int ch, char *optarg) >> switch (ch) { >> case 1: >> node_name_map_file = strdup(optarg); >> - if (node_name_map_file == NULL) >> - IBEXIT("out of memory, strdup for node_name_map_file name >> failed"); >> + if (node_name_map_file == NULL) >> + IBEXIT("out of memory, strdup for >> node_name_map_file name failed"); >> break; >> case 'm': >> multicast++; >> diff --git a/src/saquery.c b/src/saquery.c index 03fc779..1ce2f23 100644 >> --- a/src/saquery.c >> +++ b/src/saquery.c >> @@ -1555,8 +1555,8 @@ static int process_opt(void *context, int ch, char >> *optarg) >> break; >> case 3: >> node_name_map_file = strdup(optarg); >> - if (node_name_map_file == NULL) >> - IBEXIT("out of memory, strdup for node_name_map_file name >> failed"); >> + if (node_name_map_file == NULL) >> + IBEXIT("out of memory, strdup for >> node_name_map_file name failed"); >> break; >> case 4: >> if (!isxdigit(*optarg) && !(optarg = getpass("SM_Key: "))) { diff -- >> git a/src/smpquery.c b/src/smpquery.c index 3bcc984..37461b8 100644 >> --- a/src/smpquery.c >> +++ b/src/smpquery.c >> @@ -416,8 +416,8 @@ static int process_opt(void *context, int ch, char *optarg) >> switch (ch) { >> case 1: >> node_name_map_file = strdup(optarg); >> - if (node_name_map_file == NULL) >> - IBEXIT("out of memory, strdup for node_name_map_file name >> failed"); >> + if (node_name_map_file == NULL) >> + IBEXIT("out of memory, strdup for >> node_name_map_file name failed"); >> break; >> case 'c': >> ibd_dest_type = IB_DEST_DRSLID; >> -- >> 2.8.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks accepted. Ira > -----Original Message----- > From: Hal Rosenstock [mailto:hal@dev.mellanox.co.il] > Sent: Thursday, March 15, 2018 10:11 AM > To: Weiny, Ira <ira.weiny@intel.com> > Cc: Coulter, Susan K <skc@lanl.gov>; linux-rdma@vger.kernel.org > Subject: Re: [PATCH][TRIVIAL] infiniband-diags: Fix some formatting > > On 3/15/2018 12:01 PM, Weiny, Ira wrote: > > <sigh> > > > > My servers have moved and apparently I can't access github from them. So I > am unable to get Susans patch into my local repo to apply this patch. > > > > Hal could you send this as a pull request on github and I will accept it there. > > Done. > > > Github did not make the space vs tabs clear to me. I'll see if it was something I > missed. > > github showed the first line of each change as unaligned to the existing previous > line before the change due to this. > > -- Hal > > > Thanks, > > Ira > > > > > >> -----Original Message----- > >> From: Hal Rosenstock [mailto:hal@dev.mellanox.co.il] > >> Sent: Wednesday, March 14, 2018 11:13 AM > >> To: Weiny, Ira <ira.weiny@intel.com> > >> Cc: Coulter, Susan K <skc@lanl.gov>; linux-rdma@vger.kernel.org > >> Subject: [PATCH][TRIVIAL] infiniband-diags: Fix some formatting > >> > >> > >> Use leading tabs rather than leading spaces > >> > >> Introduced in: > >> commit 2ffe4ec09f0df9b4b4a80f9d6292fabebab0e5c9 > >> > >> Added check for successful strdup of node_name_map_file > >> > >> Signed-off-by: Hal Rosenstock <hal@mellanox.com> > >> --- > >> src/dump_fts.c | 4 ++-- > >> src/iblinkinfo.c | 4 ++-- > >> src/ibnetdiscover.c | 4 ++-- > >> src/ibqueryerrors.c | 4 ++-- > >> src/ibroute.c | 4 ++-- > >> src/ibtracert.c | 4 ++-- > >> src/saquery.c | 4 ++-- > >> src/smpquery.c | 4 ++-- > >> 8 files changed, 16 insertions(+), 16 deletions(-) > >> > >> diff --git a/src/dump_fts.c b/src/dump_fts.c index 932fc24..20abd24 > >> 100644 > >> --- a/src/dump_fts.c > >> +++ b/src/dump_fts.c > >> @@ -408,8 +408,8 @@ static int process_opt(void *context, int ch, char > *optarg) > >> break; > >> case 1: > >> node_name_map_file = strdup(optarg); > >> - if (node_name_map_file == NULL) > >> - IBEXIT("out of memory, strdup for node_name_map_file name > >> failed"); > >> + if (node_name_map_file == NULL) > >> + IBEXIT("out of memory, strdup for > >> node_name_map_file name failed"); > >> break; > >> default: > >> return -1; > >> diff --git a/src/iblinkinfo.c b/src/iblinkinfo.c index > >> 384d489..deccb09 100644 > >> --- a/src/iblinkinfo.c > >> +++ b/src/iblinkinfo.c > >> @@ -512,8 +512,8 @@ static int process_opt(void *context, int ch, char > *optarg) > >> switch (ch) { > >> case 1: > >> node_name_map_file = strdup(optarg); > >> - if (node_name_map_file == NULL) > >> - IBEXIT("out of memory, strdup for node_name_map_file name > >> failed"); > >> + if (node_name_map_file == NULL) > >> + IBEXIT("out of memory, strdup for > >> node_name_map_file name failed"); > >> break; > >> case 2: > >> load_cache_file = strdup(optarg); > >> diff --git a/src/ibnetdiscover.c b/src/ibnetdiscover.c index > >> ef0d7a0..0eef703 > >> 100644 > >> --- a/src/ibnetdiscover.c > >> +++ b/src/ibnetdiscover.c > >> @@ -995,8 +995,8 @@ static int process_opt(void *context, int ch, char > *optarg) > >> switch (ch) { > >> case 1: > >> node_name_map_file = strdup(optarg); > >> - if (node_name_map_file == NULL) > >> - IBEXIT("out of memory, strdup for node_name_map_file name > >> failed"); > >> + if (node_name_map_file == NULL) > >> + IBEXIT("out of memory, strdup for > >> node_name_map_file name failed"); > >> break; > >> case 2: > >> cache_file = strdup(optarg); > >> diff --git a/src/ibqueryerrors.c b/src/ibqueryerrors.c index > >> 5e49522..43b062a > >> 100644 > >> --- a/src/ibqueryerrors.c > >> +++ b/src/ibqueryerrors.c > >> @@ -909,8 +909,8 @@ static int process_opt(void *context, int ch, char > *optarg) > >> break; > >> case 1: > >> node_name_map_file = strdup(optarg); > >> - if (node_name_map_file == NULL) > >> - IBEXIT("out of memory, strdup for node_name_map_file name > >> failed"); > >> + if (node_name_map_file == NULL) > >> + IBEXIT("out of memory, strdup for > >> node_name_map_file name failed"); > >> break; > >> case 2: > >> data_counters++; > >> diff --git a/src/ibroute.c b/src/ibroute.c index 8c165e6..2514073 > >> 100644 > >> --- a/src/ibroute.c > >> +++ b/src/ibroute.c > >> @@ -408,8 +408,8 @@ static int process_opt(void *context, int ch, char > *optarg) > >> break; > >> case 1: > >> node_name_map_file = strdup(optarg); > >> - if (node_name_map_file == NULL) > >> - IBEXIT("out of memory, strdup for node_name_map_file name > >> failed"); > >> + if (node_name_map_file == NULL) > >> + IBEXIT("out of memory, strdup for > >> node_name_map_file name failed"); > >> break; > >> default: > >> return -1; > >> diff --git a/src/ibtracert.c b/src/ibtracert.c index 86816bf..1baeb5b > >> 100644 > >> --- a/src/ibtracert.c > >> +++ b/src/ibtracert.c > >> @@ -759,8 +759,8 @@ static int process_opt(void *context, int ch, char > *optarg) > >> switch (ch) { > >> case 1: > >> node_name_map_file = strdup(optarg); > >> - if (node_name_map_file == NULL) > >> - IBEXIT("out of memory, strdup for node_name_map_file name > >> failed"); > >> + if (node_name_map_file == NULL) > >> + IBEXIT("out of memory, strdup for > >> node_name_map_file name failed"); > >> break; > >> case 'm': > >> multicast++; > >> diff --git a/src/saquery.c b/src/saquery.c index 03fc779..1ce2f23 > >> 100644 > >> --- a/src/saquery.c > >> +++ b/src/saquery.c > >> @@ -1555,8 +1555,8 @@ static int process_opt(void *context, int ch, > >> char > >> *optarg) > >> break; > >> case 3: > >> node_name_map_file = strdup(optarg); > >> - if (node_name_map_file == NULL) > >> - IBEXIT("out of memory, strdup for node_name_map_file name > >> failed"); > >> + if (node_name_map_file == NULL) > >> + IBEXIT("out of memory, strdup for > >> node_name_map_file name failed"); > >> break; > >> case 4: > >> if (!isxdigit(*optarg) && !(optarg = getpass("SM_Key: "))) { diff > >> -- git a/src/smpquery.c b/src/smpquery.c index 3bcc984..37461b8 > >> 100644 > >> --- a/src/smpquery.c > >> +++ b/src/smpquery.c > >> @@ -416,8 +416,8 @@ static int process_opt(void *context, int ch, char > *optarg) > >> switch (ch) { > >> case 1: > >> node_name_map_file = strdup(optarg); > >> - if (node_name_map_file == NULL) > >> - IBEXIT("out of memory, strdup for node_name_map_file name > >> failed"); > >> + if (node_name_map_file == NULL) > >> + IBEXIT("out of memory, strdup for > >> node_name_map_file name failed"); > >> break; > >> case 'c': > >> ibd_dest_type = IB_DEST_DRSLID; > >> -- > >> 2.8.4 > >
diff --git a/src/dump_fts.c b/src/dump_fts.c index 932fc24..20abd24 100644 --- a/src/dump_fts.c +++ b/src/dump_fts.c @@ -408,8 +408,8 @@ static int process_opt(void *context, int ch, char *optarg) break; case 1: node_name_map_file = strdup(optarg); - if (node_name_map_file == NULL) - IBEXIT("out of memory, strdup for node_name_map_file name failed"); + if (node_name_map_file == NULL) + IBEXIT("out of memory, strdup for node_name_map_file name failed"); break; default: return -1; diff --git a/src/iblinkinfo.c b/src/iblinkinfo.c index 384d489..deccb09 100644 --- a/src/iblinkinfo.c +++ b/src/iblinkinfo.c @@ -512,8 +512,8 @@ static int process_opt(void *context, int ch, char *optarg) switch (ch) { case 1: node_name_map_file = strdup(optarg); - if (node_name_map_file == NULL) - IBEXIT("out of memory, strdup for node_name_map_file name failed"); + if (node_name_map_file == NULL) + IBEXIT("out of memory, strdup for node_name_map_file name failed"); break; case 2: load_cache_file = strdup(optarg); diff --git a/src/ibnetdiscover.c b/src/ibnetdiscover.c index ef0d7a0..0eef703 100644 --- a/src/ibnetdiscover.c +++ b/src/ibnetdiscover.c @@ -995,8 +995,8 @@ static int process_opt(void *context, int ch, char *optarg) switch (ch) { case 1: node_name_map_file = strdup(optarg); - if (node_name_map_file == NULL) - IBEXIT("out of memory, strdup for node_name_map_file name failed"); + if (node_name_map_file == NULL) + IBEXIT("out of memory, strdup for node_name_map_file name failed"); break; case 2: cache_file = strdup(optarg); diff --git a/src/ibqueryerrors.c b/src/ibqueryerrors.c index 5e49522..43b062a 100644 --- a/src/ibqueryerrors.c +++ b/src/ibqueryerrors.c @@ -909,8 +909,8 @@ static int process_opt(void *context, int ch, char *optarg) break; case 1: node_name_map_file = strdup(optarg); - if (node_name_map_file == NULL) - IBEXIT("out of memory, strdup for node_name_map_file name failed"); + if (node_name_map_file == NULL) + IBEXIT("out of memory, strdup for node_name_map_file name failed"); break; case 2: data_counters++; diff --git a/src/ibroute.c b/src/ibroute.c index 8c165e6..2514073 100644 --- a/src/ibroute.c +++ b/src/ibroute.c @@ -408,8 +408,8 @@ static int process_opt(void *context, int ch, char *optarg) break; case 1: node_name_map_file = strdup(optarg); - if (node_name_map_file == NULL) - IBEXIT("out of memory, strdup for node_name_map_file name failed"); + if (node_name_map_file == NULL) + IBEXIT("out of memory, strdup for node_name_map_file name failed"); break; default: return -1; diff --git a/src/ibtracert.c b/src/ibtracert.c index 86816bf..1baeb5b 100644 --- a/src/ibtracert.c +++ b/src/ibtracert.c @@ -759,8 +759,8 @@ static int process_opt(void *context, int ch, char *optarg) switch (ch) { case 1: node_name_map_file = strdup(optarg); - if (node_name_map_file == NULL) - IBEXIT("out of memory, strdup for node_name_map_file name failed"); + if (node_name_map_file == NULL) + IBEXIT("out of memory, strdup for node_name_map_file name failed"); break; case 'm': multicast++; diff --git a/src/saquery.c b/src/saquery.c index 03fc779..1ce2f23 100644 --- a/src/saquery.c +++ b/src/saquery.c @@ -1555,8 +1555,8 @@ static int process_opt(void *context, int ch, char *optarg) break; case 3: node_name_map_file = strdup(optarg); - if (node_name_map_file == NULL) - IBEXIT("out of memory, strdup for node_name_map_file name failed"); + if (node_name_map_file == NULL) + IBEXIT("out of memory, strdup for node_name_map_file name failed"); break; case 4: if (!isxdigit(*optarg) && !(optarg = getpass("SM_Key: "))) { diff --git a/src/smpquery.c b/src/smpquery.c index 3bcc984..37461b8 100644 --- a/src/smpquery.c +++ b/src/smpquery.c @@ -416,8 +416,8 @@ static int process_opt(void *context, int ch, char *optarg) switch (ch) { case 1: node_name_map_file = strdup(optarg); - if (node_name_map_file == NULL) - IBEXIT("out of memory, strdup for node_name_map_file name failed"); + if (node_name_map_file == NULL) + IBEXIT("out of memory, strdup for node_name_map_file name failed"); break; case 'c': ibd_dest_type = IB_DEST_DRSLID;
Use leading tabs rather than leading spaces Introduced in: commit 2ffe4ec09f0df9b4b4a80f9d6292fabebab0e5c9 Added check for successful strdup of node_name_map_file Signed-off-by: Hal Rosenstock <hal@mellanox.com> --- src/dump_fts.c | 4 ++-- src/iblinkinfo.c | 4 ++-- src/ibnetdiscover.c | 4 ++-- src/ibqueryerrors.c | 4 ++-- src/ibroute.c | 4 ++-- src/ibtracert.c | 4 ++-- src/saquery.c | 4 ++-- src/smpquery.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-)