| Message ID | 20241002200140.2123584-1-mh@glandium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e03b2a2105e7969ebc804c519b0a356e20a8a8d7 |
| Headers | show |
| Series | Fix unused-parameter warnings with NO_ICONV | expand |
On Thu, Oct 03, 2024 at 05:01:40AM +0900, Mike Hommey wrote: > The jk/unused-parameters topic enabled -Wunused-parameter. Some code in > some non-typical configuration lacked annotations. Thanks, this looks good. I tried to catch compile-time variants like this, but I was mostly limited to what we build in CI. Out of curiosity, what platform do you use that needs NO_ICONV (or is it just a preference)? -Peff
Mike Hommey <mh@glandium.org> writes: > The jk/unused-parameters topic enabled -Wunused-parameter. Some code in > some non-typical configuration lacked annotations. > > Signed-off-by: Mike Hommey <mh@glandium.org> > --- > utf8.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Thanks. > diff --git a/utf8.h b/utf8.h > index fcd5167baf..cce299d274 100644 > --- a/utf8.h > +++ b/utf8.h > @@ -33,8 +33,9 @@ char *reencode_string_len(const char *in, size_t insz, > const char *in_encoding, > size_t *outsz); > #else > -static inline char *reencode_string_len(const char *a, size_t b, > - const char *c, const char *d, size_t *e) > +static inline char *reencode_string_len(const char *a UNUSED, size_t b UNUSED, > + const char *c UNUSED, > + const char *d UNUSED, size_t *e) > { if (e) *e = 0; return NULL; } > #endif
On Wed, Oct 02, 2024 at 06:01:18PM -0400, Jeff King wrote: > On Thu, Oct 03, 2024 at 05:01:40AM +0900, Mike Hommey wrote: > > > The jk/unused-parameters topic enabled -Wunused-parameter. Some code in > > some non-typical configuration lacked annotations. > > Thanks, this looks good. I tried to catch compile-time variants like > this, but I was mostly limited to what we build in CI. > > Out of curiosity, what platform do you use that needs NO_ICONV (or is it > just a preference)? I'm just using parts of libgit.a and don't need the iconv support so I disable it. That avoids a dependency on the iconv dll on Windows. Mike
diff --git a/utf8.h b/utf8.h index fcd5167baf..cce299d274 100644 --- a/utf8.h +++ b/utf8.h @@ -33,8 +33,9 @@ char *reencode_string_len(const char *in, size_t insz, const char *in_encoding, size_t *outsz); #else -static inline char *reencode_string_len(const char *a, size_t b, - const char *c, const char *d, size_t *e) +static inline char *reencode_string_len(const char *a UNUSED, size_t b UNUSED, + const char *c UNUSED, + const char *d UNUSED, size_t *e) { if (e) *e = 0; return NULL; } #endif
The jk/unused-parameters topic enabled -Wunused-parameter. Some code in some non-typical configuration lacked annotations. Signed-off-by: Mike Hommey <mh@glandium.org> --- utf8.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)