Skip to content
This repository was archived by the owner on Mar 1, 2026. It is now read-only.

Commit 69851f6

Browse files
committed
Bug#33612166 DOXYGEN: UPGRADE TO VERSION 1.9.3 [no-close]
Upgrade Doxygen.in to doxygen version 1.9.2, as an intermediate step towards doxygen 1.9.3 Fix misc warnings reported by doxygen 1.9.3 Change-Id: Ia9282040e5671b3b5c19047bdc33b4b57e72ec75
1 parent f479bde commit 69851f6

19 files changed

Lines changed: 229 additions & 203 deletions

‎Doxyfile.in‎

Lines changed: 208 additions & 116 deletions
Large diffs are not rendered by default.

‎components/libminchassis/component_common.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2020, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2020, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -32,9 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
3232
that states exception type and message. On any other thrown value it just
3333
reports general error.
3434
35-
@param funcname Name of the function where the error occures.
36-
37-
@retval returns nothing.
35+
@param funcname Name of the function where the error occurs.
3836
*/
3937
void mysql_components_handle_std_exception(const char *funcname) {
4038
try {

‎components/libminchassis/dynamic_loader.cc‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2016, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2016, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -511,14 +511,6 @@ DEFINE_BOOL_METHOD(mysql_dynamic_loader_imp::iterator_create,
511511
return true;
512512
}
513513

514-
/**
515-
Releases Component iterator. Releases read lock on dynamic loader.
516-
517-
@param iterator Component iterator handle.
518-
@return Status of performed operation
519-
@retval false success
520-
@retval true failure
521-
*/
522514
DEFINE_METHOD(void, mysql_dynamic_loader_imp::iterator_release,
523515
(my_h_component_iterator iterator)) {
524516
try {

‎components/libminchassis/dynamic_loader_imp.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2016, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2016, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -144,9 +144,6 @@ class mysql_dynamic_loader_imp {
144144
Releases Component iterator. Releases read lock on dynamic loader.
145145
146146
@param iterator Component iterator handle.
147-
@return Status of performed operation
148-
@retval false success
149-
@retval true failure
150147
*/
151148
static DEFINE_METHOD(void, iterator_release,
152149
(my_h_component_iterator iterator));

‎components/libminchassis/registry.cc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2017, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2017, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -559,9 +559,6 @@ DEFINE_BOOL_METHOD(mysql_registry_imp::iterator_create,
559559
Releases Service implementations iterator. Releases read lock on registry.
560560
561561
@param iterator Service Implementation iterator handle.
562-
@return Status of performed operation
563-
@retval false success
564-
@retval true failure
565562
*/
566563
DEFINE_METHOD(void, mysql_registry_imp::iterator_release,
567564
(my_h_service_iterator iterator)) {

‎components/libminchassis/registry_imp.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2016, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2016, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -250,9 +250,6 @@ class mysql_registry_imp {
250250
Releases Service implementations iterator. Releases read lock on registry.
251251
252252
@param iterator Service Implementation iterator handle.
253-
@return Status of performed operation
254-
@retval false success
255-
@retval true failure
256253
*/
257254
static DEFINE_METHOD(void, iterator_release,
258255
(my_h_service_iterator iterator));

‎libmysql/authentication_fido/fido_assertion.cc‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ bool fido_prepare_assert::sign_challenge() {
139139
140140
@param [out] challenge_res buffer to signed challenge
141141
@param [out] challenge_res_len length of signed challenge
142-
143-
@retval void
144142
*/
145143
void fido_prepare_assert::get_signed_challenge(unsigned char **challenge_res,
146144
size_t &challenge_res_len) {
@@ -162,8 +160,6 @@ void fido_prepare_assert::get_signed_challenge(unsigned char **challenge_res,
162160
163161
@param [in] scramble buffer holding random salt
164162
@param [in] len length of salt
165-
166-
@retval void
167163
*/
168164
void fido_prepare_assert::set_scramble(unsigned char *scramble, size_t len) {
169165
fido_assert_set_clientdata_hash(m_assert, scramble, len);
@@ -174,8 +170,6 @@ void fido_prepare_assert::set_scramble(unsigned char *scramble, size_t len) {
174170
175171
@param [in] cred buffer holding credential ID
176172
@param [in] len length of credential ID
177-
178-
@retval void
179173
*/
180174
void fido_prepare_assert::set_cred_id(unsigned char *cred, size_t len) {
181175
fido_assert_allow_cred(m_assert, cred, len);
@@ -185,8 +179,6 @@ void fido_prepare_assert::set_cred_id(unsigned char *cred, size_t len) {
185179
Method to set the relying party name or id.
186180
187181
@param [in] rp_id buffer holding relying party name
188-
189-
@retval void
190182
*/
191183
void fido_prepare_assert::set_rp_id(const char *rp_id) {
192184
fido_assert_set_rp(m_assert, rp_id);

‎libmysql/authentication_fido/fido_registration.cc‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2021, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -228,8 +228,6 @@ bool fido_make_cred::make_challenge_response(
228228
229229
@param [in] scramble buffer holding random salt
230230
@param [in] len length of salt
231-
232-
@retval void
233231
*/
234232
void fido_make_cred::set_scramble(unsigned char *scramble, size_t len) {
235233
fido_cred_set_clientdata_hash(m_cred, scramble, len);
@@ -239,8 +237,6 @@ void fido_make_cred::set_scramble(unsigned char *scramble, size_t len) {
239237
Set method to set user name.
240238
241239
@param [in] user buffer holding user name
242-
243-
@retval void
244240
*/
245241
void fido_make_cred::set_user(string user) {
246242
fido_cred_set_user(m_cred,
@@ -252,17 +248,13 @@ void fido_make_cred::set_user(string user) {
252248
Method to set the algorithm type
253249
254250
@param [in] type algorithm type
255-
256-
@retval void
257251
*/
258252
void fido_make_cred::set_type(int type) { fido_cred_set_type(m_cred, type); }
259253

260254
/**
261255
Method to set the relying party name or id
262256
263257
@param [in] rp_id buffer holding relying party name
264-
265-
@retval void
266258
*/
267259
void fido_make_cred::set_rp_id(string rp_id) {
268260
fido_cred_set_rp(m_cred, rp_id.c_str(), nullptr);

‎mysql-test/mysql-test-run.dox‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@
12371237
</li>
12381238
</ul>
12391239

1240-
Ignore this guidline if your intent is to test lettercase
1240+
Ignore this guideline if your intent is to test lettercase
12411241
processing for SQL statements, of course.
12421242

12431243
Use lowercase for @ref PAGE_MYSQLTEST "mysqltest" commands
@@ -1254,8 +1254,8 @@
12541254
<li>
12551255
Break a long SQL statement into multiple lines to make it more
12561256
readable. This means that you will need to write it using a
1257-
<b>;</b> delimiter at the end of the statement rather than
1258-
using <b>`--`</b> at the beginning because the latter style
1257+
<b>";"</b> delimiter at the end of the statement rather than
1258+
using <b>"--"</b> at the beginning because the latter style
12591259
works only for single-line statements.
12601260
</li>
12611261

‎sql-common/compression.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2019, 2021, Oracle and/or its affiliates.
1+
/* Copyright (c) 2019, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -57,8 +57,6 @@ enum_compression_algorithm get_compression_algorithm(std::string name) {
5757
5858
@param name comma separated list of compression algorithm names
5959
@param[out] list list containing algorithm names
60-
61-
@retval void
6260
*/
6361
void parse_compression_algorithms_list(std::string name,
6462
std::vector<std::string> &list) {

0 commit comments

Comments
 (0)