From: Simon Marchi <simon.marchi@efficios.com>
Date: Mon, 25 Nov 2019 20:26:44 +0000 (-0500)
Subject: uri: put `inline` at beginning of strpbrk_or_eos declaration
X-Git-Tag: v2.12.0-rc1~204
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=7aa6679a7ac0f0935dfbe63f43f1901bc2395b16

uri: put `inline` at beginning of strpbrk_or_eos declaration

Fixes:

      CC       uri.lo
    /home/smarchi/src/lttng-tools/src/common/uri.c:64:1: error: ‘inline’ is not at beginning of declaration [-Werror=old-style-declaration]
     static const inline char *strpbrk_or_eos(const char *s, const char *accept)
     ^~~~~~

Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Change-Id: I2f753143e65ac4301abc01fba3e9ef122b2d38b7
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/uri.c b/src/common/uri.c
index 7fe4dd3b3..a2a5038de 100644
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -61,7 +61,7 @@ static const struct uri_proto proto_uri[] = {
  * Return pointer to the character in s matching one of the characters in
  * accept. If nothing is found, return pointer to the end of string (eos).
  */
-static const inline char *strpbrk_or_eos(const char *s, const char *accept)
+static inline const char *strpbrk_or_eos(const char *s, const char *accept)
 {
 	char *p = strpbrk(s, accept);
 	if (p == NULL) {