Skip to content

Commit 3f934e3

Browse files
pwnallpwnall
committedApr 29, 2020
Switch from C headers to C++ headers.
This CL makes the following substitutions. * assert.h -> cassert * math.h -> cmath * stdarg.h -> cstdarg * stddef.h -> cstddef * stdint.h -> cstdint * stdio.h -> cstdio * stdlib.h -> cstdlib * string.h -> cstring PiperOrigin-RevId: 309080151
·
1.23
1 parent 23d67e7 commit 3f934e3

40 files changed

+65
-76
lines changed
 

‎benchmarks/db_bench.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file. See the AUTHORS file for names of contributors.
44

5-
#include <stdio.h>
6-
#include <stdlib.h>
75
#include <sys/types.h>
86

7+
#include <cstdio>
8+
#include <cstdlib>
9+
910
#include "leveldb/cache.h"
1011
#include "leveldb/db.h"
1112
#include "leveldb/env.h"

‎benchmarks/db_bench_sqlite3.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
// found in the LICENSE file. See the AUTHORS file for names of contributors.
44

55
#include <sqlite3.h>
6-
#include <stdio.h>
7-
#include <stdlib.h>
6+
7+
#include <cstdio>
8+
#include <cstdlib>
89

910
#include "util/histogram.h"
1011
#include "util/random.h"

‎benchmarks/db_bench_tree_db.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
// found in the LICENSE file. See the AUTHORS file for names of contributors.
44

55
#include <kcpolydb.h>
6-
#include <stdio.h>
7-
#include <stdlib.h>
6+
7+
#include <cstdio>
8+
#include <cstdlib>
89

910
#include "util/histogram.h"
1011
#include "util/random.h"

‎db/db_impl.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
#include "db/db_impl.h"
66

7-
#include <stdint.h>
8-
#include <stdio.h>
9-
107
#include <algorithm>
118
#include <atomic>
9+
#include <cstdint>
10+
#include <cstdio>
1211
#include <set>
1312
#include <string>
1413
#include <vector>

‎db/db_iter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef STORAGE_LEVELDB_DB_DB_ITER_H_
66
#define STORAGE_LEVELDB_DB_DB_ITER_H_
77

8-
#include <stdint.h>
8+
#include <cstdint>
99

1010
#include "db/dbformat.h"
1111
#include "leveldb/db.h"

‎db/dbformat.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
#include "db/dbformat.h"
66

7-
#include <stdio.h>
8-
7+
#include <cstdio>
98
#include <sstream>
109

1110
#include "port/port.h"

‎db/dumpfile.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "leveldb/dumpfile.h"
66

7-
#include <stdio.h>
7+
#include <cstdio>
88

99
#include "db/dbformat.h"
1010
#include "db/filename.h"

‎db/filename.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include "db/filename.h"
66

7-
#include <ctype.h>
8-
#include <stdio.h>
7+
#include <cassert>
8+
#include <cstdio>
99

1010
#include "db/dbformat.h"
1111
#include "leveldb/env.h"

‎db/filename.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#ifndef STORAGE_LEVELDB_DB_FILENAME_H_
88
#define STORAGE_LEVELDB_DB_FILENAME_H_
99

10-
#include <stdint.h>
11-
10+
#include <cstdint>
1211
#include <string>
1312

1413
#include "leveldb/slice.h"

‎db/leveldbutil.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file. See the AUTHORS file for names of contributors.
44

5-
#include <stdio.h>
5+
#include <cstdio>
66

77
#include "leveldb/dumpfile.h"
88
#include "leveldb/env.h"

‎db/log_reader.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "db/log_reader.h"
66

7-
#include <stdio.h>
7+
#include <cstdio>
88

99
#include "leveldb/env.h"
1010
#include "util/coding.h"

‎db/log_reader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef STORAGE_LEVELDB_DB_LOG_READER_H_
66
#define STORAGE_LEVELDB_DB_LOG_READER_H_
77

8-
#include <stdint.h>
8+
#include <cstdint>
99

1010
#include "db/log_format.h"
1111
#include "leveldb/slice.h"

‎db/log_writer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "db/log_writer.h"
66

7-
#include <stdint.h>
7+
#include <cstdint>
88

99
#include "leveldb/env.h"
1010
#include "util/coding.h"

‎db/log_writer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef STORAGE_LEVELDB_DB_LOG_WRITER_H_
66
#define STORAGE_LEVELDB_DB_LOG_WRITER_H_
77

8-
#include <stdint.h>
8+
#include <cstdint>
99

1010
#include "db/log_format.h"
1111
#include "leveldb/slice.h"

‎db/table_cache.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#ifndef STORAGE_LEVELDB_DB_TABLE_CACHE_H_
88
#define STORAGE_LEVELDB_DB_TABLE_CACHE_H_
99

10-
#include <stdint.h>
11-
10+
#include <cstdint>
1211
#include <string>
1312

1413
#include "db/dbformat.h"

‎db/version_set.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44

55
#include "db/version_set.h"
66

7-
#include <stdio.h>
8-
97
#include <algorithm>
8+
#include <cstdio>
109

1110
#include "db/filename.h"
1211
#include "db/log_reader.h"

‎helpers/memenv/memenv.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
#include "helpers/memenv/memenv.h"
66

7-
#include <string.h>
8-
7+
#include <cstring>
98
#include <limits>
109
#include <map>
1110
#include <string>

‎include/leveldb/cache.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef STORAGE_LEVELDB_INCLUDE_CACHE_H_
1919
#define STORAGE_LEVELDB_INCLUDE_CACHE_H_
2020

21-
#include <stdint.h>
21+
#include <cstdint>
2222

2323
#include "leveldb/export.h"
2424
#include "leveldb/slice.h"

‎include/leveldb/db.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#ifndef STORAGE_LEVELDB_INCLUDE_DB_H_
66
#define STORAGE_LEVELDB_INCLUDE_DB_H_
77

8-
#include <stdint.h>
9-
#include <stdio.h>
8+
#include <cstdint>
9+
#include <cstdio>
1010

1111
#include "leveldb/export.h"
1212
#include "leveldb/iterator.h"

‎include/leveldb/env.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
#ifndef STORAGE_LEVELDB_INCLUDE_ENV_H_
1414
#define STORAGE_LEVELDB_INCLUDE_ENV_H_
1515

16-
#include <stdarg.h>
17-
#include <stdint.h>
18-
16+
#include <cstdarg>
17+
#include <cstdint>
1918
#include <string>
2019
#include <vector>
2120

‎include/leveldb/options.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef STORAGE_LEVELDB_INCLUDE_OPTIONS_H_
66
#define STORAGE_LEVELDB_INCLUDE_OPTIONS_H_
77

8-
#include <stddef.h>
8+
#include <cstddef>
99

1010
#include "leveldb/export.h"
1111

‎include/leveldb/slice.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
#ifndef STORAGE_LEVELDB_INCLUDE_SLICE_H_
1616
#define STORAGE_LEVELDB_INCLUDE_SLICE_H_
1717

18-
#include <assert.h>
19-
#include <stddef.h>
20-
#include <string.h>
21-
18+
#include <cassert>
19+
#include <cstddef>
20+
#include <cstring>
2221
#include <string>
2322

2423
#include "leveldb/export.h"

‎include/leveldb/table.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef STORAGE_LEVELDB_INCLUDE_TABLE_H_
66
#define STORAGE_LEVELDB_INCLUDE_TABLE_H_
77

8-
#include <stdint.h>
8+
#include <cstdint>
99

1010
#include "leveldb/export.h"
1111
#include "leveldb/iterator.h"

‎include/leveldb/table_builder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef STORAGE_LEVELDB_INCLUDE_TABLE_BUILDER_H_
1414
#define STORAGE_LEVELDB_INCLUDE_TABLE_BUILDER_H_
1515

16-
#include <stdint.h>
16+
#include <cstdint>
1717

1818
#include "leveldb/export.h"
1919
#include "leveldb/options.h"

‎table/block.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#ifndef STORAGE_LEVELDB_TABLE_BLOCK_H_
66
#define STORAGE_LEVELDB_TABLE_BLOCK_H_
77

8-
#include <stddef.h>
9-
#include <stdint.h>
8+
#include <cstddef>
9+
#include <cstdint>
1010

1111
#include "leveldb/iterator.h"
1212

‎table/block_builder.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828

2929
#include "table/block_builder.h"
3030

31-
#include <assert.h>
32-
3331
#include <algorithm>
32+
#include <cassert>
3433

3534
#include "leveldb/comparator.h"
3635
#include "leveldb/options.h"

‎table/block_builder.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
#ifndef STORAGE_LEVELDB_TABLE_BLOCK_BUILDER_H_
66
#define STORAGE_LEVELDB_TABLE_BLOCK_BUILDER_H_
77

8-
#include <stdint.h>
9-
8+
#include <cstdint>
109
#include <vector>
1110

1211
#include "leveldb/slice.h"

‎table/filter_block.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
#ifndef STORAGE_LEVELDB_TABLE_FILTER_BLOCK_H_
1010
#define STORAGE_LEVELDB_TABLE_FILTER_BLOCK_H_
1111

12-
#include <stddef.h>
13-
#include <stdint.h>
14-
12+
#include <cstddef>
13+
#include <cstdint>
1514
#include <string>
1615
#include <vector>
1716

‎table/format.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
#ifndef STORAGE_LEVELDB_TABLE_FORMAT_H_
66
#define STORAGE_LEVELDB_TABLE_FORMAT_H_
77

8-
#include <stdint.h>
9-
8+
#include <cstdint>
109
#include <string>
1110

1211
#include "leveldb/slice.h"

‎table/table_builder.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "leveldb/table_builder.h"
66

7-
#include <assert.h>
7+
#include <cassert>
88

99
#include "leveldb/comparator.h"
1010
#include "leveldb/env.h"

‎util/cache.cc

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file. See the AUTHORS file for names of contributors.
44

5-
#include <assert.h>
6-
#include <stdio.h>
7-
#include <stdlib.h>
8-
95
#include "leveldb/cache.h"
6+
7+
#include <cassert>
8+
#include <cstdio>
9+
#include <cstdlib>
10+
1011
#include "port/port.h"
1112
#include "port/thread_annotations.h"
1213
#include "util/hash.h"

‎util/crc32c.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#include "util/crc32c.h"
88

9-
#include <stddef.h>
10-
#include <stdint.h>
9+
#include <cstddef>
10+
#include <cstdint>
1111

1212
#include "port/port.h"
1313
#include "util/coding.h"

‎util/crc32c.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#ifndef STORAGE_LEVELDB_UTIL_CRC32C_H_
66
#define STORAGE_LEVELDB_UTIL_CRC32C_H_
77

8-
#include <stddef.h>
9-
#include <stdint.h>
8+
#include <cstddef>
9+
#include <cstdint>
1010

1111
namespace leveldb {
1212
namespace crc32c {

‎util/hash.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "util/hash.h"
66

7-
#include <string.h>
7+
#include <cstring>
88

99
#include "util/coding.h"
1010

‎util/hash.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#ifndef STORAGE_LEVELDB_UTIL_HASH_H_
88
#define STORAGE_LEVELDB_UTIL_HASH_H_
99

10-
#include <stddef.h>
11-
#include <stdint.h>
10+
#include <cstddef>
11+
#include <cstdint>
1212

1313
namespace leveldb {
1414

‎util/histogram.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include "util/histogram.h"
66

7-
#include <math.h>
8-
#include <stdio.h>
7+
#include <cmath>
8+
#include <cstdio>
99

1010
#include "port/port.h"
1111

‎util/logging.cc

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44

55
#include "util/logging.h"
66

7-
#include <errno.h>
8-
#include <stdarg.h>
9-
#include <stdio.h>
10-
#include <stdlib.h>
11-
7+
#include <cstdarg>
8+
#include <cstdio>
9+
#include <cstdlib>
1210
#include <limits>
1311

1412
#include "leveldb/env.h"

‎util/logging.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
#ifndef STORAGE_LEVELDB_UTIL_LOGGING_H_
99
#define STORAGE_LEVELDB_UTIL_LOGGING_H_
1010

11-
#include <stdint.h>
12-
#include <stdio.h>
13-
11+
#include <cstdint>
12+
#include <cstdio>
1413
#include <string>
1514

1615
#include "port/port.h"

‎util/random.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef STORAGE_LEVELDB_UTIL_RANDOM_H_
66
#define STORAGE_LEVELDB_UTIL_RANDOM_H_
77

8-
#include <stdint.h>
8+
#include <cstdint>
99

1010
namespace leveldb {
1111

‎util/status.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "leveldb/status.h"
66

7-
#include <stdio.h>
7+
#include <cstdio>
88

99
#include "port/port.h"
1010

0 commit comments

Comments
 (0)
Please sign in to comment.