diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-16 10:20:08 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-16 10:20:08 +0100 |
| commit | 778ebf8ee9cb22ea5727844333bcd5a6ee6bc0de (patch) | |
| tree | a754e785b286ed82b45fe4e50b980714ad80e0a7 /backend/net.c | |
| parent | 7d8aac1f3634dc58785bec7acf097dd6bac8c394 (diff) | |
| parent | 32cb765f681299af226ca0520993cbe47ba5ecd0 (diff) | |
Merge branch 'release/debian/1.2.1-1'debian/1.2.1-1
Diffstat (limited to 'backend/net.c')
| -rw-r--r-- | backend/net.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/backend/net.c b/backend/net.c index 7c4aae9..d16119a 100644 --- a/backend/net.c +++ b/backend/net.c @@ -705,9 +705,9 @@ net_avahi_resolve_callback (AvahiServiceResolver *r, AvahiIfIndex interface, Ava char *t; /* unused */ - interface = interface; - protocol = protocol; - userdata = userdata; + (void) interface; + (void) protocol; + (void) userdata; if (!r) return; @@ -759,8 +759,8 @@ net_avahi_browse_callback (AvahiServiceBrowser *b, AvahiIfIndex interface, Avahi AvahiProtocol proto; /* unused */ - flags = flags; - userdata = userdata; + (void) flags; + (void) userdata; if (!b) return; @@ -808,7 +808,7 @@ net_avahi_callback (AvahiClient *c, AvahiClientState state, void * userdata) int error; /* unused */ - userdata = userdata; + (void) userdata; if (!c) return; @@ -1201,7 +1201,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) char *full_name; int i, num_devs; size_t len; -#define ASSERT_SPACE(n) \ +#define ASSERT_SPACE(n) do \ { \ if (devlist_len + (n) > devlist_size) \ { \ @@ -1216,7 +1216,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) return SANE_STATUS_NO_MEM; \ } \ } \ - } + } while (0) DBG (3, "sane_get_devices: local_only = %d\n", local_only); @@ -2132,7 +2132,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data, SANE_Int max_length, int is_even; DBG (3, "sane_read: handle=%p, data=%p, max_length=%d, length=%p\n", - handle, data, max_length, (void *) length); + handle, (void *) data, max_length, (void *) length); if (!length) { DBG (1, "sane_read: length == NULL\n"); |