build: prohibit inline functions in C files by syntax-check

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 09d3a5620cdd25676d60ab3546744696e54273e4..62e1604e94cb565977e48ed9bdaff33f75003fd2 100644 (file)
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -1349,6 +1349,13 @@ sc_rst_since:
        halt='format :since: correctly' \
          $(_sc_search_regexp)
 
+sc_prohibit_inline_functions:
+       @prohibit='\binline\b' \
+       in_vc_files='\.c$$' \
+       exclude='exempt from syntax-check' \
+       halt='avoid inline functions in .c files' \
+         $(_sc_search_regexp)
+
 
 ## ---------- ##
 ## Exceptions ##
@@ -1506,6 +1513,9 @@ exclude_file_name_regexp--sc_black = \
 exclude_file_name_regexp--sc_spacing-check = \
   ^scripts/rpcgen/tests/test_demo\.[ch]$$
 
+exclude_file_name_regexp--sc_prohibit_inline_functions = \
+  ^src/storage_file/storage_source.*.c$$
+
 ## -------------- ##
 ## Implementation ##
 ## -------------- ##

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 040bcfec116f8d8a805690af2bc5e5f82509de07..eee42b5c70fd8e2f145fc8f3efb075701be26c9a 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -187,7 +187,7 @@ hypervFreeInvokeParams(hypervInvokeParamsList *params)
 }
 
 
-static inline void
+static void
 hypervCheckParams(hypervInvokeParamsList *params)
 {
     if (params->nbParams + 1 > params->nbAvailParams) {

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 0b86300b431fba19b7857e8cadb6815b3164c848..1017fc65b1ed493f1a2d9ecaee6f1fb86d27e9df 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -93,13 +93,13 @@ virLockDaemonFree(virLockDaemon *lockd)
     g_free(lockd);
 }
 
-static inline void
+static void
 virLockDaemonLock(virLockDaemon *lockd)
 {
     g_mutex_lock(&lockd->lock);
 }
 
-static inline void
+static void
 virLockDaemonUnlock(virLockDaemon *lockd)
 {
     g_mutex_unlock(&lockd->lock);

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index f0601924ae1dde8ef6a8a77957a21e76614da757..b1f50b6c676ae0989023e427c952f931823f5fb1 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2767,7 +2767,7 @@ qemuBlockThrottleFilterGetNodename(virDomainThrottleFilterDef *filter)
  *
  * Build "arguments" part of "blockdev-add" QMP cmd.
  */
-static inline virJSONValue *
+static virJSONValue *
 qemuBlockThrottleFilterGetProps(virDomainThrottleFilterDef *filter,
                                 const char *parentNodeName)
 {

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 08069ffac89cc85acc3ecedc0e9964f57b9a236a..fec48edfc1daa410822dd6d4d09c702159fd64c1 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2033,7 +2033,7 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virCommand *cmd,
 }
 
 
-static inline bool
+static bool
 qemuDiskConfigThrottleGroupEnabled(const virDomainThrottleGroupDef *group)
 {
     return !!group->group_name &&

diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index 702df641a06e8af75b0d66985c33d7bf24dfb3a8..aa030798ce19f05d6993896d3a70a525519e53e0 100644 (file)
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -48,7 +48,7 @@ VIR_ENUM_IMPL(qemuSaveFormat,
               "sparse",
 );
 
-static inline void
+static void
 qemuSaveImageBswapHeader(virQEMUSaveHeader *hdr)
 {
     hdr->version = GUINT32_SWAP_LE_BE(hdr->version);

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 91219c3eedd69f19462da640024f602e9c5d7f9f..bad9bff2d5e4385771005bef55d0da8ca8018711 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -78,8 +78,8 @@ static virClass *virNetServerClass;
 static void virNetServerDispose(void *obj);
 static void virNetServerUpdateServicesLocked(virNetServer *srv,
                                              bool enabled);
-static inline size_t virNetServerTrackPendingAuthLocked(virNetServer *srv);
-static inline size_t virNetServerTrackCompletedAuthLocked(virNetServer *srv);
+static size_t virNetServerTrackPendingAuthLocked(virNetServer *srv);
+static size_t virNetServerTrackCompletedAuthLocked(virNetServer *srv);
 
 static int
 virNetServerOnceInit(void)
@@ -901,14 +901,14 @@ virNetServerShutdownWait(virNetServer *srv)
 }
 
 
-static inline size_t
+static size_t
 virNetServerTrackPendingAuthLocked(virNetServer *srv)
 {
     return ++srv->nclients_unauth;
 }
 
 
-static inline size_t
+static size_t
 virNetServerTrackCompletedAuthLocked(virNetServer *srv)
 {
     return --srv->nclients_unauth;

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 28d5fce4f065590e90e772b7deda194b8aaaadfa..8f7fc6cc01e32f1429496412a6027e79a092a310 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -98,13 +98,13 @@ virStorageBackendNamespaceInit(int poolType,
  * Upon success, return 0.  Otherwise, return -1 and set errno.
  */
 #ifdef __linux__
-static inline int
+static int
 reflinkCloneFile(int dest_fd, int src_fd)
 {
     return ioctl(dest_fd, FICLONE, src_fd);
 }
 #else
-static inline int
+static int
 reflinkCloneFile(int dest_fd G_GNUC_UNUSED,
                  int src_fd G_GNUC_UNUSED)
 {

diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c
index baa7a0b1c0ee225b84a2a2b8825c76a8cc341bad..7430018d6e15590701c6f912de40c7cfd883e5a4 100644 (file)
--- a/src/util/virhashcode.c
+++ b/src/util/virhashcode.c
@@ -35,7 +35,7 @@ static uint32_t rotl32(uint32_t x, int8_t r)
 }
 
 /* slower than original but handles platforms that do only aligned reads */
-static inline uint32_t getblock(const uint8_t *p, int i)
+static uint32_t getblock(const uint8_t *p, int i)
 {
     uint32_t r;
     size_t size = sizeof(r);
@@ -48,7 +48,7 @@ static inline uint32_t getblock(const uint8_t *p, int i)
 /*
  * Finalization mix - force all bits of a hash block to avalanche
  */
-static inline uint32_t fmix(uint32_t h)
+static uint32_t fmix(uint32_t h)
 {
     h ^= h >> 16;
     h *= 0x85ebca6b;

diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c
index e00accd9eb1413f059930f819de0678d8e5422b9..34a705d79707f039793fcfb0fad75021681cbbde 100644 (file)
--- a/src/util/virthreadpool.c
+++ b/src/util/virthreadpool.c
@@ -82,7 +82,7 @@ struct virThreadPoolWorkerData {
 /* Test whether the worker needs to quit if the current number of workers @count
  * is greater than @limit actually allows.
  */
-static inline bool virThreadPoolWorkerQuitHelper(size_t count, size_t limit)
+static bool virThreadPoolWorkerQuitHelper(size_t count, size_t limit)
 {
     return count > limit;
 }

diff --git a/src/util/virxml.c b/src/util/virxml.c
index ad967a2564ecf37980a5c59559d2ee3dd740fe08..9d46e5f32faabfdb875db19d11211793fd662bcf 100644 (file)
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1152,7 +1152,7 @@ virXMLParseHelper(int domcode,
     else if (url)
         docname = url;
     else
-        docname = "[inline data]";
+        docname = "[inline data]"; /* exempt from syntax-check */
 
     /* Set up a parser context so we can catch the details of XML errors. */
     pctxt = xmlNewParserCtxt();

diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c
index 3d634b5ae8347e7b5b09da23c29919f1c313111c..69bf59850e12ebaa31313707950bb03c21cc408b 100644 (file)
--- a/tools/nss/libvirt_nss.c
+++ b/tools/nss/libvirt_nss.c
@@ -230,7 +230,7 @@ NSS_NAME(gethostbyname2)(const char *name, int af, struct hostent *result,
                                     errnop, herrnop, NULL, NULL);
 }
 
-static inline void *
+static void *
 move_and_align(void *buf, size_t len, size_t *idx)
 {
     char *buffer = buf;