* Re: [PATCH] depmod: add missing "else" clause [not found] ` <1375912738-25114-2-git-send-email-jengelh@inai.de> @ 2013-08-09 15:03 ` Lucas De Marchi 2013-08-09 18:27 ` H. Peter Anvin 0 siblings, 1 reply; 2+ messages in thread From: Lucas De Marchi @ 2013-08-09 15:03 UTC (permalink / raw) To: Jan Engelhardt; +Cc: Lucas De Marchi, lkml, linux-modules Hi Jan, On Wed, Aug 7, 2013 at 6:58 PM, Jan Engelhardt <jengelh@inai.de> wrote: > > It occurred to an openSUSE user that our mkinitrd would throw a > warning when used with kmod: > > libkmod: conf_files_list: unsupported file mode /dev/null: 0x21b6 > > Grepping for the error message revealed that there might be a missing > "else" keyword here, since it is unusual to put an "if" directly after > closing brace. > --- > libkmod/libkmod-config.c | 2 +- > tools/depmod.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c > index 201c349..cb4cf61 100644 > --- a/libkmod/libkmod-config.c > +++ b/libkmod/libkmod-config.c > @@ -833,7 +833,7 @@ static int conf_files_list(struct kmod_ctx *ctx, struct kmod_list **list, > if (S_ISREG(st.st_mode)) { > conf_files_insert_sorted(ctx, list, path, NULL); > return 0; > - } if (!S_ISDIR(st.st_mode)) { > + } else if (!S_ISDIR(st.st_mode)) { > ERR(ctx, "unsupported file mode %s: %#x\n", > path, st.st_mode); > return -EINVAL; > diff --git a/tools/depmod.c b/tools/depmod.c > index 4a02631..985cf3a 100644 > --- a/tools/depmod.c > +++ b/tools/depmod.c > @@ -848,7 +848,7 @@ static int cfg_files_list(struct cfg_file ***p_files, size_t *p_n_files, > if (S_ISREG(st.st_mode)) { > cfg_files_insert_sorted(p_files, p_n_files, path, NULL); > return 0; > - } if (!S_ISDIR(st.st_mode)) { > + } else if (!S_ISDIR(st.st_mode)) { > ERR("unsupported file mode %s: %#x\n", path, st.st_mode); > return -EINVAL; > } > -- Applied, thanks. Please make sure to CC linux-modules@vger.kernel.org Lucas De Marchi ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] depmod: add missing "else" clause 2013-08-09 15:03 ` [PATCH] depmod: add missing "else" clause Lucas De Marchi @ 2013-08-09 18:27 ` H. Peter Anvin 0 siblings, 0 replies; 2+ messages in thread From: H. Peter Anvin @ 2013-08-09 18:27 UTC (permalink / raw) To: Lucas De Marchi; +Cc: Jan Engelhardt, Lucas De Marchi, lkml, linux-modules On 08/09/2013 08:03 AM, Lucas De Marchi wrote: > Hi Jan, > > > On Wed, Aug 7, 2013 at 6:58 PM, Jan Engelhardt <jengelh@inai.de> wrote: >> >> It occurred to an openSUSE user that our mkinitrd would throw a >> warning when used with kmod: >> >> libkmod: conf_files_list: unsupported file mode /dev/null: 0x21b6 >> >> Grepping for the error message revealed that there might be a missing >> "else" keyword here, since it is unusual to put an "if" directly after >> closing brace. >> --- >> libkmod/libkmod-config.c | 2 +- >> tools/depmod.c | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c >> index 201c349..cb4cf61 100644 >> --- a/libkmod/libkmod-config.c >> +++ b/libkmod/libkmod-config.c >> @@ -833,7 +833,7 @@ static int conf_files_list(struct kmod_ctx *ctx, struct kmod_list **list, >> if (S_ISREG(st.st_mode)) { >> conf_files_insert_sorted(ctx, list, path, NULL); >> return 0; >> - } if (!S_ISDIR(st.st_mode)) { >> + } else if (!S_ISDIR(st.st_mode)) { >> ERR(ctx, "unsupported file mode %s: %#x\n", >> path, st.st_mode); >> return -EINVAL; >> diff --git a/tools/depmod.c b/tools/depmod.c >> index 4a02631..985cf3a 100644 >> --- a/tools/depmod.c >> +++ b/tools/depmod.c >> @@ -848,7 +848,7 @@ static int cfg_files_list(struct cfg_file ***p_files, size_t *p_n_files, >> if (S_ISREG(st.st_mode)) { >> cfg_files_insert_sorted(p_files, p_n_files, path, NULL); >> return 0; >> - } if (!S_ISDIR(st.st_mode)) { >> + } else if (!S_ISDIR(st.st_mode)) { >> ERR("unsupported file mode %s: %#x\n", path, st.st_mode); >> return -EINVAL; >> } >> -- > > Applied, thanks. > > Please make sure to CC linux-modules@vger.kernel.org > Also please note that this is a stylistic change only, since the previous if clause ends with a return. -hpa ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-09 18:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1375912738-25114-1-git-send-email-jengelh@inai.de>
[not found] ` <1375912738-25114-2-git-send-email-jengelh@inai.de>
2013-08-09 15:03 ` [PATCH] depmod: add missing "else" clause Lucas De Marchi
2013-08-09 18:27 ` H. Peter Anvin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).