diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:18:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 14:51:45 +0200 |
| commit | 2aa51f528fd5d23cc54eca8fbd07e88e7b2993c7 (patch) | |
| tree | 307e5e223ff4f1a76fa219e4bb8f8f8add91bc39 /extra | |
| parent | 9d2e2d753323a934604d25144b9d1ecaf34b47d8 (diff) | |
| download | mariadb-git-2aa51f528fd5d23cc54eca8fbd07e88e7b2993c7.tar.gz | |
Various compier warnings
gcc 5.4 and 7.1, Debug and Release builds
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 5 | ||||
| -rw-r--r-- | extra/my_print_defaults.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 14d7c5821c7..2c67f48af4a 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -5054,7 +5054,7 @@ xb_process_datadir( callback */ { ulint ret; - char dbpath[FN_REFLEN]; + char dbpath[OS_FILE_MAX_PATH]; os_file_dir_t dir; os_file_dir_t dbdir; os_file_stat_t dbinfo; @@ -5120,8 +5120,7 @@ next_file_item_1: goto next_datadir_item; } - sprintf(dbpath, "%s/%s", path, - dbinfo.name); + snprintf(dbpath, sizeof(dbpath), "%s/%s", path, dbinfo.name); srv_normalize_path_for_win(dbpath); dbdir = os_file_opendir(dbpath, FALSE); diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index cb883a60f85..78940e02ca4 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -98,7 +98,8 @@ static struct my_option my_long_options[] = {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} }; -void cleanup_and_exit(int exit_code) +static void cleanup_and_exit(int exit_code) __attribute__ ((noreturn)); +static void cleanup_and_exit(int exit_code) { my_end(0); exit(exit_code); |