From: Ján Tomko <jtomko(a)redhat.com&gt; Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- build-aux/syntax-check.mk | 10 ++++++++++ src/hyperv/hyperv_wmi.c | 2 +- src/locking/lock_daemon.c | 4 ++-- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_saveimage.c | 2 +- src/rpc/virnetserver.c | 8 ++++---- src/storage/storage_util.c | 4 ++-- src/util/virhashcode.c | 4 ++-- src/util/virthreadpool.c | 2 +- src/util/virxml.c | 2 +- tools/nss/libvirt_nss.c | 2 +- 12 files changed, 27 insertions(+), 17 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 09d3a5620c..62e1604e94 100644 --- 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 040bcfec11..eee42b5c70 100644 --- 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 0b86300b43..1017fc65b1 100644 --- 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 f0601924ae..b1f50b6c67 100644 --- 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 08069ffac8..fec48edfc1 100644 --- 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 702df641a0..aa030798ce 100644 --- 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 91219c3eed..bad9bff2d5 100644 --- 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 28d5fce4f0..8f7fc6cc01 100644 --- 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 baa7a0b1c0..7430018d6e 100644 --- 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 e00accd9eb..34a705d797 100644 --- 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 ad967a2564..9d46e5f32f 100644 --- 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 3d634b5ae8..69bf59850e 100644 --- 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; -- 2.49.0