[PATCH 1/2] lib/open: remove incorrect unused attribute

[PATCH 1/2] lib/open: remove incorrect unused attribute

[David Bremner]

With the current unused macro in lib/notmuch-private.h this seems
harmless, but is misleading, since the parameter is in fact used.
---
 lib/open.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/open.cc b/lib/open.cc
index b4637ec5..3b86065b 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -186,7 +186,7 @@ notmuch_status_t
 notmuch_database_open_with_config (const char *database_path,
 				   notmuch_database_mode_t mode,
 				   const char *config_path,
-				   unused(const char *profile),
+				   const char *profile,
 				   notmuch_database_t **database,
 				   char **status_string)
 {
-- 
2.30.0

[PATCH 2/2] lib: use a stricter unused macro

[David Bremner]

This would have caught bugs like the one corrected in the previous commit.
---
 lib/notmuch-private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 2fbf7ab9..2f5ccd6a 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -76,7 +76,7 @@ NOTMUCH_BEGIN_DECLS
 #define NOTMUCH_CLEAR_BIT(valp,  bit) \
     (_NOTMUCH_VALID_BIT (bit) ? (*(valp) &= ~(1ull << (bit))) : *(valp))
 
-#define unused(x) x __attribute__ ((unused))
+#define unused(x) x ## _unused __attribute__ ((unused))
 
 /* Thanks to Andrew Tridgell's (SAMBA's) talloc for this definition of
  * unlikely. The talloc source code comes to us via the GNU LGPL v. 3.
-- 
2.30.0

Re: [PATCH 2/2] lib: use a stricter unused macro

[Tomi Ollila]

On Sun, Feb 14 2021, David Bremner wrote:

> This would have caught bugs like the one corrected in the previous
> commit.

Series LGTM.

Tomi

> ---
>  lib/notmuch-private.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
> index 2fbf7ab9..2f5ccd6a 100644
> --- a/lib/notmuch-private.h
> +++ b/lib/notmuch-private.h
> @@ -76,7 +76,7 @@ NOTMUCH_BEGIN_DECLS
>  #define NOTMUCH_CLEAR_BIT(valp,  bit) \
>      (_NOTMUCH_VALID_BIT (bit) ? (*(valp) &= ~(1ull << (bit))) : *(valp))
>  
> -#define unused(x) x __attribute__ ((unused))
> +#define unused(x) x ## _unused __attribute__ ((unused))

looks familiar ;D

>  
>  /* Thanks to Andrew Tridgell's (SAMBA's) talloc for this definition of
>   * unlikely. The talloc source code comes to us via the GNU LGPL v. 3.
> -- 
> 2.30.0

Re: [PATCH 2/2] lib: use a stricter unused macro

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> On Sun, Feb 14 2021, David Bremner wrote:
>
>> This would have caught bugs like the one corrected in the previous
>> commit.
>
> Series LGTM.
>
> Tomi

Applied to master