Skip to content

Commit 5624a84

Browse files
jelujelu
authored
Merge pull request #106 from jelu/auto
auto
2 parents a77f2a5 + 0866f45 commit 5624a84

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

‎src/packet_handler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ class Fragments {
102102
bool merged = true;
103103
// this is algorithmically horrid (hope there wont be tonnes of fragments)
104104
while (merged) {
105-
merged = false;
106-
std::list<Range>::iterator it = m_ranges.begin();
107-
std::list<Range>::iterator last = it;
105+
merged = false;
106+
auto it = m_ranges.begin();
107+
auto last = it;
108108
if (last == m_ranges.end())
109109
break;
110110
it++;

‎src/server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,14 +500,14 @@ namespace httpd {
500500
}
501501
const char* get_param(const char* param)
502502
{
503-
std::map<std::string, std::string>::iterator it = m_params.find(std::string(param));
503+
auto it = m_params.find(std::string(param));
504504
if (it == m_params.end())
505505
return 0;
506506
return it->second.c_str();
507507
}
508508
void add_param(std::string key, std::string val)
509509
{
510-
std::map<std::string, std::string>::iterator it = m_params.find(key);
510+
auto it = m_params.find(key);
511511
if (it == m_params.end()) {
512512
m_params[key] = val;
513513
m_counts[key] = 1;

‎src/sql.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ int g_comp = 0;
101101

102102
void Ordering_terms::compile(const std::vector<Table*>& tables, const std::vector<int>& search_order, Query& q)
103103
{
104-
for (std::vector<Ordering_terms::OP_dir>::iterator it = m_terms.begin(); it != m_terms.end(); it++) {
104+
for (auto it = m_terms.begin(); it != m_terms.end(); it++) {
105105
OP* op = it->m_op;
106106
it->m_op = op->compile(tables, search_order, q);
107107
}
@@ -120,7 +120,7 @@ class Sorter {
120120
Row** ia_rows = &ia;
121121
Row** ib_rows = &ib;
122122

123-
for (std::vector<Ordering_terms::OP_dir>::iterator it = m_order.m_terms.begin(); it != m_order.m_terms.end(); it++) {
123+
for (auto it = m_order.m_terms.begin(); it != m_order.m_terms.end(); it++) {
124124
g_comp++;
125125

126126
OP* op = it->m_op;
@@ -139,7 +139,7 @@ class Sorter {
139139
Row** ia_rows = &ia;
140140
Row** ib_rows = &ib;
141141

142-
for (std::vector<Ordering_terms::OP_dir>::iterator it = m_order.m_terms.begin(); it != m_order.m_terms.end(); it++) {
142+
for (auto it = m_order.m_terms.begin(); it != m_order.m_terms.end(); it++) {
143143
g_comp++;
144144

145145
OP* op = it->m_op;
@@ -156,7 +156,7 @@ class Sorter {
156156
Row** ia_rows = &ia;
157157
Row** ib_rows = &ib;
158158

159-
for (std::vector<Ordering_terms::OP_dir>::iterator it = m_order.m_terms.begin(); it != m_order.m_terms.end(); it++) {
159+
for (auto it = m_order.m_terms.begin(); it != m_order.m_terms.end(); it++) {
160160
g_comp++;
161161

162162
OP* op = it->m_op;
@@ -389,8 +389,8 @@ class Per_sort {
389389
int table_size = (int)m_table.m_rows.size();
390390
if (table_size <= 1)
391391
return;
392-
std::list<Row*>::iterator it = m_table.m_rows.begin();
393-
Tlink* links = new Tlink[table_size];
392+
auto it = m_table.m_rows.begin();
393+
Tlink* links = new Tlink[table_size];
394394

395395
int i;
396396
for (i = 0; i < table_size; i++) {
@@ -469,9 +469,9 @@ void Table::merge_sort(Ordering_terms& order)
469469
Row** row_ptrs = new Row*[table_size];
470470
Spkt* spktpool = new Spkt[table_size * 2];
471471
Spkt* rows[2];
472-
rows[0] = spktpool;
473-
rows[1] = &spktpool[table_size];
474-
std::list<Row*>::iterator it = m_rows.begin();
472+
rows[0] = spktpool;
473+
rows[1] = &spktpool[table_size];
474+
auto it = m_rows.begin();
475475

476476
int i = 0;
477477
Spkt* r = rows[0];
@@ -569,9 +569,9 @@ void Table::merge_sort(Ordering_terms& order)
569569

570570
void Table::limit(int limit, int offset)
571571
{
572-
int count = 0;
573-
std::list<Row*>::iterator e = m_rows.end();
574-
for (std::list<Row*>::iterator it = m_rows.begin(); it != m_rows.end(); it++) {
572+
int count = 0;
573+
auto e = m_rows.end();
574+
for (auto it = m_rows.begin(); it != m_rows.end(); it++) {
575575
if (e != m_rows.end()) {
576576
delete_row(*e);
577577
m_rows.erase(e);
@@ -649,7 +649,7 @@ void Table::xml()
649649
g_output.add_string("</th>");
650650
}
651651
g_output.add_string("</tr>\n");
652-
for (std::list<Row*>::iterator it = m_rows.begin(); it != m_rows.end(); it++) {
652+
for (auto it = m_rows.begin(); it != m_rows.end(); it++) {
653653
g_output.add_string("<tr>");
654654
Row* r = *it;
655655

@@ -752,7 +752,7 @@ void Table::json(bool trailing_comma)
752752
g_output.add_q_string("data");
753753
g_output.add_string(": [");
754754
bool outer_comma = false;
755-
for (std::list<Row*>::iterator it = m_rows.begin(); it != m_rows.end(); it++) {
755+
for (auto it = m_rows.begin(); it != m_rows.end(); it++) {
756756
if (outer_comma)
757757
g_output.add_string(",\n [");
758758
else
@@ -829,7 +829,7 @@ void Table::csv(bool format)
829829
int max = 0;
830830
char* tmp = 0;
831831
if (format) {
832-
for (std::list<Row*>::iterator it = m_rows.begin(); it != m_rows.end(); it++) {
832+
for (auto it = m_rows.begin(); it != m_rows.end(); it++) {
833833
Row* r = *it;
834834

835835
for (int i = 0; i < cols; i++) {
@@ -899,7 +899,7 @@ void Table::csv(bool format)
899899
}
900900
}
901901
printf("\n");
902-
for (std::list<Row*>::iterator it = m_rows.begin(); it != m_rows.end(); it++) {
902+
for (auto it = m_rows.begin(); it != m_rows.end(); it++) {
903903
Row* r = *it;
904904

905905
for (int i = 0; i < cols; i++) {
@@ -973,7 +973,7 @@ void Table::dump()
973973
printf("\n");
974974
printrep((width + 2) * cols + 1, '*');
975975
printf("\n");
976-
for (std::list<Row*>::iterator it = m_rows.begin(); it != m_rows.end(); it++) {
976+
for (auto it = m_rows.begin(); it != m_rows.end(); it++) {
977977
printf("|");
978978
Row* r = *it;
979979

@@ -1025,15 +1025,15 @@ class Parser {
10251025

10261026
void dump()
10271027
{
1028-
for (std::list<Token>::iterator it = m_tokens.begin(); it != m_tokens.end(); it++) {
1028+
for (auto it = m_tokens.begin(); it != m_tokens.end(); it++) {
10291029
printf("Type %d: %s\n", it->get_type(), it->get_token());
10301030
}
10311031
}
10321032

10331033
bool analyze(Query& q)
10341034
{
1035-
std::list<Token>::iterator it = m_tokens.begin();
1036-
bool ok = true;
1035+
auto it = m_tokens.begin();
1036+
bool ok = true;
10371037
while (ok) {
10381038
ok = false;
10391039
if (get_sample_stmt(q, it))
@@ -2115,7 +2115,7 @@ std::vector<OP*> find_unique_column_ops(std::vector<OP*> ops)
21152115
void Query::replace_star_column_with_all_columns()
21162116
{
21172117
bool found_star = false;
2118-
for (std::vector<OP*>::iterator i = m_select.begin(); i != m_select.end(); ++i) {
2118+
for (auto i = m_select.begin(); i != m_select.end(); ++i) {
21192119
if (strcmp((*i)->get_token(), "*") == 0) {
21202120
found_star = true;
21212121
break;
@@ -2239,7 +2239,7 @@ std::vector<Variant> process_group_by_key(Ordering_terms& group_by, Row** rows)
22392239
bool Query::has_aggregate_functions()
22402240
{
22412241
// this assumes the ops have been compiled
2242-
for (std::vector<OP*>::iterator it = m_select.begin(); it != m_select.end(); it++)
2242+
for (auto it = m_select.begin(); it != m_select.end(); it++)
22432243
if ((*it)->m_has_aggregate_function)
22442244
return true;
22452245

@@ -2442,9 +2442,9 @@ bool DB::query(const char* q)
24422442

24432443
Table* DB::get_table(const char* i_name)
24442444
{
2445-
std::string name = lower(i_name);
2446-
Table* t = 0;
2447-
std::map<std::string, Table*>::iterator it = m_tables.find(name);
2445+
std::string name = lower(i_name);
2446+
Table* t = 0;
2447+
auto it = m_tables.find(name);
24482448
if (it != m_tables.end())
24492449
t = it->second;
24502450

@@ -2542,7 +2542,7 @@ Cc_func::Cc_func(const OP& op)
25422542
paths.push_front(std::string(env));
25432543
}
25442544

2545-
std::list<std::string>::iterator i = paths.begin();
2545+
auto i = paths.begin();
25462546
for (; i != paths.end(); i++) {
25472547
db = (*i) + "/GeoLite2-Country.mmdb";
25482548
struct stat s;
@@ -2634,7 +2634,7 @@ Asn_func::Asn_func(const OP& op)
26342634
paths.push_front(std::string(env));
26352635
}
26362636

2637-
std::list<std::string>::iterator i = paths.begin();
2637+
auto i = paths.begin();
26382638
for (; i != paths.end(); i++) {
26392639
db = (*i) + "/GeoLite2-ASN.mmdb";
26402640
struct stat s;

‎src/sql.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ class DB {
168168
RefCountString* get_value(const char* table, int key)
169169
{
170170
Item i;
171-
i.m_function = table;
172-
i.m_key = key;
173-
std::map<Item, std::string>::iterator it = m_lut.find(i);
171+
i.m_function = table;
172+
i.m_key = key;
173+
auto it = m_lut.find(i);
174174
if (it != m_lut.end())
175175
return RefCountString::construct(it->second.c_str());
176176

@@ -206,7 +206,7 @@ class Allocator {
206206
}
207207
~Allocator()
208208
{
209-
typename std::list<Buffer*>::iterator it = m_buffers.begin();
209+
auto it = m_buffers.begin();
210210
while (it != m_buffers.end()) {
211211
delete *it;
212212
m_buffers.erase(it);
@@ -224,7 +224,7 @@ class Allocator {
224224

225225
T* obj = m_curr_buffer->allocate();
226226
if (!obj) {
227-
for (typename std::list<Buffer*>::iterator it = m_buffers.begin();
227+
for (auto it = m_buffers.begin();
228228
it != m_buffers.end();
229229
it++) {
230230
if ((*it)->m_has_space)
@@ -398,7 +398,7 @@ class Table {
398398
int get_col_index(const char* col)
399399
{
400400
int i = 0;
401-
for (std::vector<Column*>::iterator it = m_cols.begin(); it != m_cols.end(); it++) {
401+
for (auto it = m_cols.begin(); it != m_cols.end(); it++) {
402402
if (cmpii(m_cols[i]->m_name, col))
403403
return i;
404404
i++;
@@ -1821,7 +1821,7 @@ class Ordering_terms {
18211821
}
18221822
~Ordering_terms()
18231823
{
1824-
std::vector<OP_dir>::iterator it = m_terms.begin();
1824+
auto it = m_terms.begin();
18251825
while (it != m_terms.end()) {
18261826
delete it->m_op;
18271827
it->m_op = 0;

‎src/tcp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class Stream {
162162
int get_size()
163163
{
164164
int size = 0;
165-
for (std::list<Data_segment>::iterator it = m_segments.begin();
165+
for (auto it = m_segments.begin();
166166
it != m_segments.end(); it++) {
167167
size += it->m_datasize;
168168
}
@@ -172,7 +172,7 @@ class Stream {
172172
void dump()
173173
{
174174
int start = 2;
175-
for (std::list<Data_segment>::iterator it = m_segments.begin();
175+
for (auto it = m_segments.begin();
176176
it != m_segments.end(); it++) {
177177
for (unsigned int i = start; i < it->m_datasize; i++) {
178178
printf("%02x", it->m_data[i]);
@@ -188,7 +188,7 @@ class Stream {
188188
unsigned char* get_buffer()
189189
{
190190
int p = 0;
191-
for (std::list<Data_segment>::iterator it = m_segments.begin();
191+
for (auto it = m_segments.begin();
192192
it != m_segments.end(); it++) {
193193
for (unsigned int i = 0; i < it->m_datasize; i++) {
194194
m_buffer[p++] = it->m_data[i];

0 commit comments

Comments
 (0)