1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From 2aa934cc516aab5a008bf2155b6acb284816ebb8 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 16 Aug 2020 16:23:49 -0700
Subject: [PATCH] Avoid return of void expression
---
lib/filter.c | 2 +-
lib/init.c | 2 +-
lib/internal.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/filter.c b/lib/filter.c
index 7ca56a8..d43c912 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -223,7 +223,7 @@ pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d)
return pci_filter_match_v33(&new, d);
}
-STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v33(a, f))
+STATIC_ALIAS_VOID(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v33(a, f))
SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0)
SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@@LIBPCI_3.3)
diff --git a/lib/init.c b/lib/init.c
index 4703dbd..e660f36 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -245,7 +245,7 @@ pci_init_v35(struct pci_access *a)
a->methods->init(a);
}
-STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a))
+STATIC_ALIAS_VOID(void pci_init(struct pci_access *a), pci_init_v35(a))
DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35)
SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0)
SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5)
diff --git a/lib/internal.h b/lib/internal.h
index 17c27e1..d516e30 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -26,6 +26,7 @@
#else
#define VERSIONED_ABI
#define STATIC_ALIAS(_decl, _for) _decl { return _for; }
+#define STATIC_ALIAS_VOID(_decl, _for) _decl { _for; }
#define DEFINE_ALIAS(_decl, _for)
#define SYMBOL_VERSION(_int, _ext)
#endif
--
2.28.0
|
