diff options
| author | Monty <monty@mariadb.org> | 2020-01-29 16:41:04 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-01-29 23:23:55 +0200 |
| commit | 4d61f1247a1b6a86570cb03d3450930a78d689b3 (patch) | |
| tree | e7b98495425ae73591c8c1f3cf81793196aca3ea /strings | |
| parent | cd2c0e013ccb5f9b009743dfd7188585a539d9b5 (diff) | |
| download | mariadb-git-4d61f1247a1b6a86570cb03d3450930a78d689b3.tar.gz | |
Fixed compiler warnings from gcc 7.4.1
- Fixed possible error in rocksdb/rdb_datadic.cc
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-bin.c | 2 | ||||
| -rw-r--r-- | strings/ctype-simple.c | 4 | ||||
| -rw-r--r-- | strings/json_lib.c | 10 | ||||
| -rw-r--r-- | strings/strcoll.ic | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index e4bd6d2b5c2..0324c0665e2 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -219,7 +219,7 @@ static size_t my_case_str_bin(CHARSET_INFO *cs __attribute__((unused)), static size_t my_case_bin(CHARSET_INFO *cs __attribute__((unused)), const char *src, size_t srclen, - char *dst, size_t dstlen) + char *dst, size_t dstlen __attribute__((unused))) { DBUG_ASSERT(srclen <= dstlen); memcpy(dst, src, srclen); diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 17cb51ff8cb..1ce180e30e4 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -237,7 +237,7 @@ size_t my_casedn_str_8bit(CHARSET_INFO * cs,char *str) size_t my_caseup_8bit(CHARSET_INFO * cs, const char *src, size_t srclen, - char *dst, size_t dstlen) + char *dst, size_t dstlen __attribute__((unused))) { const char *end= src + srclen; register const uchar *map= cs->to_upper; @@ -249,7 +249,7 @@ size_t my_caseup_8bit(CHARSET_INFO * cs, const char *src, size_t srclen, size_t my_casedn_8bit(CHARSET_INFO * cs, const char *src, size_t srclen, - char *dst, size_t dstlen) + char *dst, size_t dstlen __attribute__((unused))) { const char *end= src + srclen; register const uchar *map=cs->to_lower; diff --git a/strings/json_lib.c b/strings/json_lib.c index bb8c15ee0c1..8a77c41d015 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -1995,9 +1995,13 @@ err_return: } -enum json_types json_get_object_nkey(const char *js,const char *js_end, int nkey, - const char **keyname, const char **keyname_end, - const char **value, int *value_len) +enum json_types json_get_object_nkey(const char *js __attribute__((unused)), + const char *js_end __attribute__((unused)), + int nkey __attribute__((unused)), + const char **keyname __attribute__((unused)), + const char **keyname_end __attribute__((unused)), + const char **value __attribute__((unused)), + int *value_len __attribute__((unused))) { return JSV_NOTHING; } diff --git a/strings/strcoll.ic b/strings/strcoll.ic index 50278135dd4..86789fc4189 100644 --- a/strings/strcoll.ic +++ b/strings/strcoll.ic @@ -367,7 +367,7 @@ MY_FUNCTION_NAME(strnxfrm)(CHARSET_INFO *cs, static size_t -MY_FUNCTION_NAME(strnxfrm_internal)(CHARSET_INFO *cs, +MY_FUNCTION_NAME(strnxfrm_internal)(CHARSET_INFO *cs __attribute__((unused)), uchar *dst, uchar *de, uint *nweights, const uchar *src, const uchar *se) @@ -489,7 +489,7 @@ MY_FUNCTION_NAME(strnxfrm_nopad)(CHARSET_INFO *cs, static size_t -MY_FUNCTION_NAME(strnxfrm_internal)(CHARSET_INFO *cs, +MY_FUNCTION_NAME(strnxfrm_internal)(CHARSET_INFO *cs __attribute__((unused)), uchar *dst, uchar *de, uint *nweights, const uchar *src, |