| Message ID | 20200704235453.7756-1-luc.vanoostenryck@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | sindex: avoid a warning with 'case -1:' | expand |
On Sun, Jul 05, 2020 at 01:54:53AM +0200, Luc Van Oostenryck wrote: > When parsing the format, there is a 'case -1:' which: > * seems to be there only for the following label (but mixing > labels with cases, like here, is OK). > * on architectures where chars are unsigned, the compiler complains: > warning: case label value is less than minimum value for type > > So, remove the unneeded 'case -1:' and use an explicit 'default:' > to catch invalid formats. Also, align the label with the cases, > it looks nicer so. > > Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> Looks good :) Reviewed-by: Alexey Gladkov <gladkov.alexey@gmail.com> > --- > sindex.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/sindex.c b/sindex.c > index ea092a4a434b..22836a957213 100644 > --- a/sindex.c > +++ b/sindex.c > @@ -970,8 +970,8 @@ static int search_query_callback(void *data, int argc, char **argv, char **colna > print_file_line(argv[0], atoi(argv[1])); > fmt++; > break; > - case -1: > -print_string: > + > + print_string: > if (n) { > printf("%.*s", n, buf); > n = 0; > @@ -979,6 +979,9 @@ print_string: > printf("%s", argv[colnum]); > fmt++; > break; > + default: > + break; > + > } > > if (pos == fmt) > -- > 2.27.0 >
On Sun, Jul 05, 2020 at 01:12:04PM +0200, Alexey Gladkov wrote: > > Looks good :) > > Reviewed-by: Alexey Gladkov <gladkov.alexey@gmail.com> Thanks. It's now pushed to the main tree. -- Luc
diff --git a/sindex.c b/sindex.c index ea092a4a434b..22836a957213 100644 --- a/sindex.c +++ b/sindex.c @@ -970,8 +970,8 @@ static int search_query_callback(void *data, int argc, char **argv, char **colna print_file_line(argv[0], atoi(argv[1])); fmt++; break; - case -1: -print_string: + + print_string: if (n) { printf("%.*s", n, buf); n = 0; @@ -979,6 +979,9 @@ print_string: printf("%s", argv[colnum]); fmt++; break; + default: + break; + } if (pos == fmt)
When parsing the format, there is a 'case -1:' which: * seems to be there only for the following label (but mixing labels with cases, like here, is OK). * on architectures where chars are unsigned, the compiler complains: warning: case label value is less than minimum value for type So, remove the unneeded 'case -1:' and use an explicit 'default:' to catch invalid formats. Also, align the label with the cases, it looks nicer so. Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> --- sindex.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)