diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-25 11:28:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-25 11:28:26 +0200 |
| commit | 4a22056c975762891db11eff1bcda157d65cb0b0 (patch) | |
| tree | 0712e1cb2cd095d5ef0f962dfaeef8cea967b506 | |
| parent | 6479006e14691ff85072d06682f81b90875e9cb0 (diff) | |
| download | mariadb-git-4a22056c975762891db11eff1bcda157d65cb0b0.tar.gz | |
Cleanup: Remove redundant nonnull attributes
| -rw-r--r-- | storage/innobase/include/os0file.h | 3 | ||||
| -rw-r--r-- | storage/innobase/include/trx0undo.h | 3 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index c82375e4f5f..d01a15c28ed 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -237,8 +237,7 @@ private: @param off byte offset from the start (SEEK_SET) @param len size of the hole in bytes @return DB_SUCCESS or error code */ - dberr_t punch_hole(os_offset_t off, ulint len) const - MY_ATTRIBUTE((nonnull)); + dberr_t punch_hole(os_offset_t off, ulint len) const; public: /** Page to be written on write operation */ diff --git a/storage/innobase/include/trx0undo.h b/storage/innobase/include/trx0undo.h index 9325f39a309..e032c53263a 100644 --- a/storage/innobase/include/trx0undo.h +++ b/storage/innobase/include/trx0undo.h @@ -160,8 +160,7 @@ trx_undo_get_first_rec(const fil_space_t &space, uint32_t page_no, NOTE: This corresponds to a redo log record and must not be changed! @see mtr_t::undo_create() @param[in,out] block undo log page */ -void trx_undo_page_init(const buf_block_t &block) - MY_ATTRIBUTE((nonnull)); +void trx_undo_page_init(const buf_block_t &block); /** Allocate an undo log page. @param[in,out] undo undo log diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index b53c7888509..6a5cc362791 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -341,7 +341,7 @@ static dberr_t create_log_file(bool create_new_db, lsn_t lsn, @param[in,out] logfile0 name of the first log file @return error code @retval DB_SUCCESS on successful operation */ -MY_ATTRIBUTE((warn_unused_result, nonnull)) +MY_ATTRIBUTE((warn_unused_result)) static dberr_t create_log_file_rename(lsn_t lsn, std::string &logfile0) { ut_ad(!srv_log_file_created); |