Skip to content

Commit fcaf619

Browse files
committed
Remove the "register" keyword
1 parent 88b1905 commit fcaf619

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

storage/innobase/page/page0page.cc

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2012, Facebook Inc.
5+
Copyright (c) 2018, MariaDB Corporation.
56
67
This program is free software; you can redistribute it and/or modify it under
78
the terms of the GNU General Public License as published by the Free Software
@@ -93,17 +94,13 @@ page_dir_find_owner_slot(
9394
/*=====================*/
9495
const rec_t* rec) /*!< in: the physical record */
9596
{
96-
const page_t* page;
97-
register uint16 rec_offs_bytes;
98-
register const page_dir_slot_t* slot;
99-
register const page_dir_slot_t* first_slot;
100-
register const rec_t* r = rec;
101-
10297
ut_ad(page_rec_check(rec));
10398

104-
page = page_align(rec);
105-
first_slot = page_dir_get_nth_slot(page, 0);
106-
slot = page_dir_get_nth_slot(page, page_dir_get_n_slots(page) - 1);
99+
const page_t* page = page_align(rec);
100+
const page_dir_slot_t* first_slot = page_dir_get_nth_slot(page, 0);
101+
const page_dir_slot_t* slot = page_dir_get_nth_slot(
102+
page, page_dir_get_n_slots(page) - 1);
103+
const rec_t* r = rec;
107104

108105
if (page_is_comp(page)) {
109106
while (rec_get_n_owned_new(r) == 0) {
@@ -119,7 +116,7 @@ page_dir_find_owner_slot(
119116
}
120117
}
121118

122-
rec_offs_bytes = mach_encode_2(r - page);
119+
uint16 rec_offs_bytes = mach_encode_2(r - page);
123120

124121
while (UNIV_LIKELY(*(uint16*) slot != rec_offs_bytes)) {
125122

storage/xtradb/page/page0page.cc

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2012, Facebook Inc.
5+
Copyright (c) 2018, MariaDB Corporation.
56
67
This program is free software; you can redistribute it and/or modify it under
78
the terms of the GNU General Public License as published by the Free Software
@@ -98,17 +99,13 @@ page_dir_find_owner_slot(
9899
/*=====================*/
99100
const rec_t* rec) /*!< in: the physical record */
100101
{
101-
const page_t* page;
102-
register uint16 rec_offs_bytes;
103-
register const page_dir_slot_t* slot;
104-
register const page_dir_slot_t* first_slot;
105-
register const rec_t* r = rec;
106-
107102
ut_ad(page_rec_check(rec));
108103

109-
page = page_align(rec);
110-
first_slot = page_dir_get_nth_slot(page, 0);
111-
slot = page_dir_get_nth_slot(page, page_dir_get_n_slots(page) - 1);
104+
const page_t* page = page_align(rec);
105+
const page_dir_slot_t* first_slot = page_dir_get_nth_slot(page, 0);
106+
const page_dir_slot_t* slot = page_dir_get_nth_slot(
107+
page, page_dir_get_n_slots(page) - 1);
108+
const rec_t* r = rec;
112109

113110
if (page_is_comp(page)) {
114111
while (rec_get_n_owned_new(r) == 0) {
@@ -124,7 +121,7 @@ page_dir_find_owner_slot(
124121
}
125122
}
126123

127-
rec_offs_bytes = mach_encode_2(r - page);
124+
uint16 rec_offs_bytes = mach_encode_2(r - page);
128125

129126
while (UNIV_LIKELY(*(uint16*) slot != rec_offs_bytes)) {
130127

0 commit comments

Comments
 (0)