summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-10-09 10:28:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-10-09 14:47:17 +0200
commit7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 (patch)
tree616ab419fe0f01e94740de7faacb393775420589 /solenv
parent664db0d945fbb23e115eeea8377e3a4e88541da1 (diff)
Extend loplugin:redundantinline to catch inline functions w/o external linkage
...where "inline" (in its meaning of "this function can be defined in multiple translation units") thus doesn't make much sense. (As discussed in compilerplugins/clang/redundantinline.cxx, exempt such "static inline" functions in include files for now.) All the rewriting has been done automatically by the plugin, except for one instance in sw/source/ui/frmdlg/column.cxx that used to involve an #if), plus some subsequent solenv/clang-format/reformat-formatted-files. Change-Id: Ib8b996b651aeafc03bbdc8890faa05ed50517224 Reviewed-on: https://gerrit.libreoffice.org/61573 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/concat-deps.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index abb743e8efac..b4f224450ce2 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -142,7 +142,7 @@ int result = 32;
}
#endif
-static inline unsigned int get_unaligned_uint(const unsigned char* cursor)
+static unsigned int get_unaligned_uint(const unsigned char* cursor)
{
unsigned int result;
@@ -254,7 +254,7 @@ void* next;
}
}
-static inline void* pool_alloc(struct pool* pool)
+static void* pool_alloc(struct pool* pool)
{
void* data;
@@ -522,7 +522,7 @@ unsigned int i;
}
}
-static inline int compare_key(struct hash const * hash, const char* a, const char* b, int len, int const * cost)
+static int compare_key(struct hash const * hash, const char* a, const char* b, int len, int const * cost)
{
#ifdef HASH_STAT
*cost += 1;
@@ -715,7 +715,7 @@ static void cancel_relative(char const * base, char** ref_cursor, char** ref_cur
*ref_cursor_out = cursor_out;
}
-static inline void eat_space(char ** token)
+static void eat_space(char ** token)
{
while ((' ' == **token) || ('\t' == **token)) {
++(*token);
@@ -726,7 +726,7 @@ static inline void eat_space(char ** token)
* Prune LibreOffice specific duplicate dependencies to improve
* gnumake startup time, and shrink the disk-space footprint.
*/
-static inline int
+static int
elide_dependency(const char* key, int key_len, const char **unpacked_end)
{
#if 0
@@ -788,7 +788,7 @@ static void emit_unpacked_target(const char* token, const char* end)
}
/* prefix paths to absolute */
-static inline void print_fullpaths(char* line)
+static void print_fullpaths(char* line)
{
char* token;
char* end;
@@ -861,7 +861,7 @@ static inline void print_fullpaths(char* line)
}
}
-static inline char * eat_space_at_end(char * end)
+static char * eat_space_at_end(char * end)
{
char * real_end;
assert('\0' == *end);
@@ -875,7 +875,7 @@ static inline char * eat_space_at_end(char * end)
}
static char* phony_content_buffer;
-static inline char* generate_phony_line(char const * phony_target, char const * extension)
+static char* generate_phony_line(char const * phony_target, char const * extension)
{
char const * src;
char* dest;
@@ -900,7 +900,7 @@ char* last_dot = NULL;
return phony_content_buffer;
}
-static inline int generate_phony_file(char* fn, char const * content)
+static int generate_phony_file(char* fn, char const * content)
{
FILE* depfile;
depfile = fopen(fn, "w");