Skip to content

Commit 8742743

Browse files
trostentrosten
committed
Bug#36500268 Upgrade to clang-format 15 [trunk]
Switch to Latest for Standard: Cpp11 is in fact alias for Latest: https://clang.llvm.org/docs/ClangFormatStyleOptions.html Also remove duplicate specifications for same option, which is error in clang 18+. Change-Id: I076718f4225cf7e5328084def68701209232b904
1 parent 43d6707 commit 8742743

File tree

307 files changed

+1499
-1553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+1499
-1553
lines changed

‎.clang-format‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# along with this program; if not, write to the Free Software
2222
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2323

24-
# We currently use clang-format version 10.
24+
# We currently use clang-format version 15.
2525
#
2626
# This is the output of
2727
#
@@ -98,15 +98,13 @@ ConstructorInitializerIndentWidth: 4
9898
ContinuationIndentWidth: 4
9999
Cpp11BracedListStyle: true
100100
DeriveLineEnding: true
101-
#DerivePointerAlignment: true
102101
DisableFormat: false
103102
ExperimentalAutoDetectBinPacking: false
104103
FixNamespaceComments: true
105104
ForEachMacros:
106105
- foreach
107106
- Q_FOREACH
108107
- BOOST_FOREACH
109-
#IncludeBlocks: Regroup
110108
IncludeCategories:
111109
- Regex: '^<ext/.*\.h>'
112110
Priority: 2
@@ -146,7 +144,6 @@ PenaltyBreakString: 1000
146144
PenaltyBreakTemplateDeclaration: 10
147145
PenaltyExcessCharacter: 1000000
148146
PenaltyReturnTypeOnItsOwnLine: 200
149-
#PointerAlignment: Left
150147
RawStringFormats:
151148
- Language: Cpp
152149
Delimiters:
@@ -197,7 +194,6 @@ SpacesInCStyleCastParentheses: false
197194
SpacesInParentheses: false
198195
SpacesInSquareBrackets: false
199196
SpaceBeforeSquareBrackets: false
200-
#Standard: Auto
201197
StatementMacros:
202198
- Q_UNUSED
203199
- QT_REQUIRE_VERSION
@@ -210,7 +206,6 @@ UseTab: Never
210206
DerivePointerAlignment: false
211207
PointerAlignment: Right
212208

213-
# MySQL source code is allowed to use the latest c++ features.
214209
Standard: Latest
215210

216211
# MySQL includes frequently are not order-independent (e.g. my_config.h needs
@@ -277,15 +272,13 @@ ConstructorInitializerIndentWidth: 4
277272
ContinuationIndentWidth: 4
278273
Cpp11BracedListStyle: true
279274
DeriveLineEnding: true
280-
DerivePointerAlignment: true
281275
DisableFormat: false
282276
ExperimentalAutoDetectBinPacking: false
283277
FixNamespaceComments: true
284278
ForEachMacros:
285279
- foreach
286280
- Q_FOREACH
287281
- BOOST_FOREACH
288-
IncludeBlocks: Regroup
289282
IncludeCategories:
290283
- Regex: '^<ext/.*\.h>'
291284
Priority: 2
@@ -325,7 +318,6 @@ PenaltyBreakString: 1000
325318
PenaltyBreakTemplateDeclaration: 10
326319
PenaltyExcessCharacter: 1000000
327320
PenaltyReturnTypeOnItsOwnLine: 200
328-
PointerAlignment: Left
329321
RawStringFormats:
330322
- Language: Cpp
331323
Delimiters:
@@ -376,7 +368,6 @@ SpacesInCStyleCastParentheses: false
376368
SpacesInParentheses: false
377369
SpacesInSquareBrackets: false
378370
SpaceBeforeSquareBrackets: false
379-
Standard: Auto
380371
StatementMacros:
381372
- Q_UNUSED
382373
- QT_REQUIRE_VERSION

‎client/mysql.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3352,7 +3352,8 @@ void add_syslog(const char *line) {
33523352
"CONNECTION_ID:%lu, DB_SERVER:'%s', DB:'%s', QUERY:'%s'",
33533353
/* use the cached user/sudo_user value. */
33543354
current_os_sudouser ? current_os_sudouser
3355-
: current_os_user ? current_os_user : "--",
3355+
: current_os_user ? current_os_user
3356+
: "--",
33563357
current_user ? current_user : "--", mysql_thread_id(&mysql_handle),
33573358
current_host ? current_host : "--", current_db ? current_db : "--",
33583359
line);

‎client/mysqlbinlog.cc‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2260,8 +2260,10 @@ extern "C" bool get_one_option(int optid, const struct my_option *opt,
22602260
"--read-from-remote-source"));
22612261
[[fallthrough]];
22622262
case OPT_REMOTE_PROTO:
2263-
opt_remote_proto = (enum_remote_proto)(
2264-
find_type_or_exit(argument, &remote_proto_typelib, opt->name) - 1);
2263+
opt_remote_proto =
2264+
(enum_remote_proto)(find_type_or_exit(argument, &remote_proto_typelib,
2265+
opt->name) -
2266+
1);
22652267
break;
22662268
case OPT_MYSQL_PROTOCOL:
22672269
opt_protocol =
@@ -2274,9 +2276,11 @@ extern "C" bool get_one_option(int optid, const struct my_option *opt,
22742276
stop_datetime = convert_str_to_timestamp(stop_datetime_str);
22752277
break;
22762278
case OPT_BASE64_OUTPUT_MODE:
2277-
opt_base64_output_mode = (enum_base64_output_mode)(
2278-
find_type_or_exit(argument, &base64_output_mode_typelib, opt->name) -
2279-
1);
2279+
opt_base64_output_mode =
2280+
(enum_base64_output_mode)(find_type_or_exit(
2281+
argument, &base64_output_mode_typelib,
2282+
opt->name) -
2283+
1);
22802284
break;
22812285
case 'v':
22822286
if (argument == disabled_my_option)

‎client/mysqldump.cc‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6061,9 +6061,9 @@ static bool get_view_structure(char *table, char *db) {
60616061
search_len =
60626062
(ulong)(strxmov(ptr, "WITH ", row[0], " CHECK OPTION", NullS) - ptr);
60636063
ptr = replace_buf;
6064-
replace_len = (ulong)(
6065-
strxmov(ptr, "*/\n/*!50002 WITH ", row[0], " CHECK OPTION", NullS) -
6066-
ptr);
6064+
replace_len = (ulong)(strxmov(ptr, "*/\n/*!50002 WITH ", row[0],
6065+
" CHECK OPTION", NullS) -
6066+
ptr);
60676067
replace(&ds_view, search_buf, search_len, replace_buf, replace_len);
60686068
}
60696069

@@ -6083,19 +6083,23 @@ static bool get_view_structure(char *table, char *db) {
60836083
host_name_str, &host_name_len);
60846084

60856085
ptr = search_buf;
6086-
search_len = (ulong)(
6087-
strxmov(ptr, "DEFINER=",
6088-
quote_name(user_name_str, quoted_user_name_str, false), "@",
6089-
quote_name(host_name_str, quoted_host_name_str, false),
6090-
" SQL SECURITY ", row[2], NullS) -
6091-
ptr);
6086+
search_len =
6087+
(ulong)(strxmov(
6088+
ptr, "DEFINER=",
6089+
quote_name(user_name_str, quoted_user_name_str, false),
6090+
"@",
6091+
quote_name(host_name_str, quoted_host_name_str, false),
6092+
" SQL SECURITY ", row[2], NullS) -
6093+
ptr);
60926094
ptr = replace_buf;
6093-
replace_len = (ulong)(
6094-
strxmov(ptr, "*/\n/*!50013 DEFINER=",
6095-
quote_name(user_name_str, quoted_user_name_str, false), "@",
6096-
quote_name(host_name_str, quoted_host_name_str, false),
6097-
" SQL SECURITY ", row[2], " */\n/*!50001", NullS) -
6098-
ptr);
6095+
replace_len =
6096+
(ulong)(strxmov(
6097+
ptr, "*/\n/*!50013 DEFINER=",
6098+
quote_name(user_name_str, quoted_user_name_str, false),
6099+
"@",
6100+
quote_name(host_name_str, quoted_host_name_str, false),
6101+
" SQL SECURITY ", row[2], " */\n/*!50001", NullS) -
6102+
ptr);
60996103
replace(&ds_view, search_buf, search_len, replace_buf, replace_len);
61006104
}
61016105

‎client/mysqlshow.cc‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,9 +619,15 @@ static int list_tables(MYSQL *mysql, const char *db, const char *table) {
619619
}
620620

621621
print_trailer(
622-
head_length, (opt_table_type ? 10 : opt_verbose > 0 ? 8 : 0),
622+
head_length,
623+
(opt_table_type ? 10
624+
: opt_verbose > 0 ? 8
625+
: 0),
623626
(opt_table_type ? (opt_verbose > 0 ? 8 : 0) : (opt_verbose > 1 ? 10 : 0)),
624-
!opt_table_type ? 0 : opt_verbose > 1 ? 10 : 0, 0);
627+
!opt_table_type ? 0
628+
: opt_verbose > 1 ? 10
629+
: 0,
630+
0);
625631

626632
if (counter && opt_verbose)
627633
printf("%u row%s in set.\n\n", counter, (counter > 1) ? "s" : "");

‎client/mysqltest.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,7 +2881,7 @@ static void var_set_escape(struct st_command *command, VAR *dst) {
28812881
- the second string,
28822882
- a bool that is false if the parsing succeeded; true if it failed.
28832883
*/
2884-
auto parse_args = [&]() -> auto {
2884+
auto parse_args = [&]() -> auto{
28852885
// command->first_argument contains '(characters,text)'
28862886
char *p = command->first_argument;
28872887
// Find (
@@ -3557,7 +3557,7 @@ static void free_dynamic_strings(T *val) {
35573557
/// the function, through recursion, end up being
35583558
/// freed by dynstr_free().
35593559
template <typename T1, typename... T2>
3560-
static void free_dynamic_strings(T1 *first, T2 *... rest) {
3560+
static void free_dynamic_strings(T1 *first, T2 *...rest) {
35613561
free_dynamic_strings(first);
35623562
free_dynamic_strings(rest...);
35633563
}

‎components/libminchassis/gunit_harness/include/mock/pfs_plugin_table_v1_all_empty.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2929
namespace pfs_plugin_table_v1_all_empty {
3030

3131
DEFINE_METHOD(int, add_tables,
32-
(PFS_engine_table_share_proxy * */*st_share*/,
32+
(PFS_engine_table_share_proxy * * /*st_share*/,
3333
unsigned int /*share_count*/)) {
3434
return 0;
3535
}
3636

3737
DEFINE_METHOD(int, delete_tables,
38-
(PFS_engine_table_share_proxy * */*st_share*/,
38+
(PFS_engine_table_share_proxy * * /*st_share*/,
3939
unsigned int /*share_count*/)) {
4040
return 0;
4141
}

‎components/mysqlbackup/backup_page_tracker.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ bool Backup_page_tracker::page_track_get_changed_pages_init(UDF_INIT *,
347347
Callback method for initialization of UDF
348348
"mysqlbackup_page_track_get_changed_pages".
349349
*/
350-
void Backup_page_tracker::page_track_get_changed_pages_deinit(UDF_INIT *initid [
351-
[maybe_unused]]) {
350+
void Backup_page_tracker::page_track_get_changed_pages_deinit(
351+
UDF_INIT *initid [[maybe_unused]]) {
352352
free(m_changed_pages_buf);
353353
m_changed_pages_buf = nullptr;
354354
}

‎components/test/test_status_var_reader.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class udf_list {
8888

8989
private:
9090
udf_list_t set;
91-
} * list;
91+
} *list;
9292

9393
/* actual test material */
9494
namespace udf_impl {

‎components/test/test_udf_registration.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class udf_list {
9494

9595
private:
9696
udf_list_t set;
97-
} * list;
97+
} *list;
9898

9999
/* actual test material */
100100
namespace udf_impl {

0 commit comments

Comments
 (0)