Skip to content

Commit e8e8d97

Browse files
rzarzynskirzarzynski
committed
tools/rados: refactor NULL -> nullptr in main()
Signed-off-by: Radoslaw Zarzynski <[email protected]>
1 parent 87d633d commit e8e8d97

File tree

1 file changed

+64
-64
lines changed

1 file changed

+64
-64
lines changed

‎src/tools/rados/rados.cc‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -4176,145 +4176,145 @@ int main(int argc, const char **argv)
41764176
}
41774177
}
41784178

4179-
auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
4179+
auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
41804180
CODE_ENVIRONMENT_UTILITY, 0);
41814181
common_init_finish(g_ceph_context);
41824182

41834183
std::vector<const char*>::iterator i;
41844184
for (i = args.begin(); i != args.end(); ) {
41854185
if (ceph_argparse_double_dash(args, i)) {
41864186
break;
4187-
} else if (ceph_argparse_flag(args, i, "--force-full", (char*)NULL)) {
4187+
} else if (ceph_argparse_flag(args, i, "--force-full", (char*)nullptr)) {
41884188
opts["force-full"] = "true";
4189-
} else if (ceph_argparse_flag(args, i, "-d", "--delete-after", (char*)NULL)) {
4189+
} else if (ceph_argparse_flag(args, i, "-d", "--delete-after", (char*)nullptr)) {
41904190
opts["delete-after"] = "true";
41914191
} else if (ceph_argparse_flag(args, i, "-C", "--create", "--create-pool",
4192-
(char*)NULL)) {
4192+
(char*)nullptr)) {
41934193
opts["create"] = "true";
4194-
} else if (ceph_argparse_flag(args, i, "--pretty-format", (char*)NULL)) {
4194+
} else if (ceph_argparse_flag(args, i, "--pretty-format", (char*)nullptr)) {
41954195
opts["pretty-format"] = "true";
4196-
} else if (ceph_argparse_flag(args, i, "--show-time", (char*)NULL)) {
4196+
} else if (ceph_argparse_flag(args, i, "--show-time", (char*)nullptr)) {
41974197
opts["show-time"] = "true";
4198-
} else if (ceph_argparse_flag(args, i, "--no-cleanup", (char*)NULL)) {
4198+
} else if (ceph_argparse_flag(args, i, "--no-cleanup", (char*)nullptr)) {
41994199
opts["no-cleanup"] = "true";
4200-
} else if (ceph_argparse_flag(args, i, "--no-hints", (char*)NULL)) {
4200+
} else if (ceph_argparse_flag(args, i, "--no-hints", (char*)nullptr)) {
42014201
opts["no-hints"] = "true";
4202-
} else if (ceph_argparse_flag(args, i, "--reuse-bench", (char*)NULL)) {
4202+
} else if (ceph_argparse_flag(args, i, "--reuse-bench", (char*)nullptr)) {
42034203
opts["reuse-bench"] = "true";
4204-
} else if (ceph_argparse_flag(args, i, "--no-verify", (char*)NULL)) {
4204+
} else if (ceph_argparse_flag(args, i, "--no-verify", (char*)nullptr)) {
42054205
opts["no-verify"] = "true";
4206-
} else if (ceph_argparse_witharg(args, i, &val, "--run-name", (char*)NULL)) {
4206+
} else if (ceph_argparse_witharg(args, i, &val, "--run-name", (char*)nullptr)) {
42074207
opts["run-name"] = val;
4208-
} else if (ceph_argparse_witharg(args, i, &val, "--prefix", (char*)NULL)) {
4208+
} else if (ceph_argparse_witharg(args, i, &val, "--prefix", (char*)nullptr)) {
42094209
opts["prefix"] = val;
4210-
} else if (ceph_argparse_witharg(args, i, &val, "-p", "--pool", (char*)NULL)) {
4210+
} else if (ceph_argparse_witharg(args, i, &val, "-p", "--pool", (char*)nullptr)) {
42114211
opts["pool"] = val;
4212-
} else if (ceph_argparse_witharg(args, i, &val, "--target-pool", (char*)NULL)) {
4212+
} else if (ceph_argparse_witharg(args, i, &val, "--target-pool", (char*)nullptr)) {
42134213
opts["target_pool"] = val;
4214-
} else if (ceph_argparse_witharg(args, i, &val, "--object-locator" , (char *)NULL)) {
4214+
} else if (ceph_argparse_witharg(args, i, &val, "--object-locator" , (char *)nullptr)) {
42154215
opts["object_locator"] = val;
4216-
} else if (ceph_argparse_witharg(args, i, &val, "--target-locator" , (char *)NULL)) {
4216+
} else if (ceph_argparse_witharg(args, i, &val, "--target-locator" , (char *)nullptr)) {
42174217
opts["target_locator"] = val;
4218-
} else if (ceph_argparse_witharg(args, i, &val, "--target-nspace" , (char *)NULL)) {
4218+
} else if (ceph_argparse_witharg(args, i, &val, "--target-nspace" , (char *)nullptr)) {
42194219
opts["target_nspace"] = val;
42204220
#ifdef WITH_LIBRADOSSTRIPER
4221-
} else if (ceph_argparse_flag(args, i, "--striper" , (char *)NULL)) {
4221+
} else if (ceph_argparse_flag(args, i, "--striper" , (char *)nullptr)) {
42224222
opts["striper"] = "true";
42234223
#endif
4224-
} else if (ceph_argparse_witharg(args, i, &val, "-t", "--concurrent-ios", (char*)NULL)) {
4224+
} else if (ceph_argparse_witharg(args, i, &val, "-t", "--concurrent-ios", (char*)nullptr)) {
42254225
opts["concurrent-ios"] = val;
4226-
} else if (ceph_argparse_witharg(args, i, &val, "--block-size", (char*)NULL)) {
4226+
} else if (ceph_argparse_witharg(args, i, &val, "--block-size", (char*)nullptr)) {
42274227
opts["block-size"] = val;
4228-
} else if (ceph_argparse_witharg(args, i, &val, "-b", (char*)NULL)) {
4228+
} else if (ceph_argparse_witharg(args, i, &val, "-b", (char*)nullptr)) {
42294229
opts["block-size"] = val;
4230-
} else if (ceph_argparse_witharg(args, i, &val, "--object-size", (char*)NULL)) {
4230+
} else if (ceph_argparse_witharg(args, i, &val, "--object-size", (char*)nullptr)) {
42314231
opts["object-size"] = val;
4232-
} else if (ceph_argparse_witharg(args, i, &val, "--max-objects", (char*)NULL)) {
4232+
} else if (ceph_argparse_witharg(args, i, &val, "--max-objects", (char*)nullptr)) {
42334233
opts["max-objects"] = val;
4234-
} else if (ceph_argparse_witharg(args, i, &val, "--offset", (char*)NULL)) {
4234+
} else if (ceph_argparse_witharg(args, i, &val, "--offset", (char*)nullptr)) {
42354235
opts["offset"] = val;
4236-
} else if (ceph_argparse_witharg(args, i, &val, "-O", (char*)NULL)) {
4236+
} else if (ceph_argparse_witharg(args, i, &val, "-O", (char*)nullptr)) {
42374237
opts["object-size"] = val;
4238-
} else if (ceph_argparse_witharg(args, i, &val, "-s", "--snap", (char*)NULL)) {
4238+
} else if (ceph_argparse_witharg(args, i, &val, "-s", "--snap", (char*)nullptr)) {
42394239
opts["snap"] = val;
4240-
} else if (ceph_argparse_witharg(args, i, &val, "-S", "--snapid", (char*)NULL)) {
4240+
} else if (ceph_argparse_witharg(args, i, &val, "-S", "--snapid", (char*)nullptr)) {
42414241
opts["snapid"] = val;
4242-
} else if (ceph_argparse_witharg(args, i, &val, "--min-object-size", (char*)NULL)) {
4242+
} else if (ceph_argparse_witharg(args, i, &val, "--min-object-size", (char*)nullptr)) {
42434243
opts["min-object-size"] = val;
4244-
} else if (ceph_argparse_witharg(args, i, &val, "--max-object-size", (char*)NULL)) {
4244+
} else if (ceph_argparse_witharg(args, i, &val, "--max-object-size", (char*)nullptr)) {
42454245
opts["max-object-size"] = val;
4246-
} else if (ceph_argparse_witharg(args, i, &val, "--min-op-len", (char*)NULL)) {
4246+
} else if (ceph_argparse_witharg(args, i, &val, "--min-op-len", (char*)nullptr)) {
42474247
opts["min-op-len"] = val;
4248-
} else if (ceph_argparse_witharg(args, i, &val, "--max-op-len", (char*)NULL)) {
4248+
} else if (ceph_argparse_witharg(args, i, &val, "--max-op-len", (char*)nullptr)) {
42494249
opts["max-op-len"] = val;
4250-
} else if (ceph_argparse_witharg(args, i, &val, "--max-ops", (char*)NULL)) {
4250+
} else if (ceph_argparse_witharg(args, i, &val, "--max-ops", (char*)nullptr)) {
42514251
opts["max-ops"] = val;
4252-
} else if (ceph_argparse_witharg(args, i, &val, "--max-backlog", (char*)NULL)) {
4252+
} else if (ceph_argparse_witharg(args, i, &val, "--max-backlog", (char*)nullptr)) {
42534253
opts["max-backlog"] = val;
4254-
} else if (ceph_argparse_witharg(args, i, &val, "--target-throughput", (char*)NULL)) {
4254+
} else if (ceph_argparse_witharg(args, i, &val, "--target-throughput", (char*)nullptr)) {
42554255
opts["target-throughput"] = val;
4256-
} else if (ceph_argparse_witharg(args, i, &val, "--offset-align", (char*)NULL)) {
4256+
} else if (ceph_argparse_witharg(args, i, &val, "--offset-align", (char*)nullptr)) {
42574257
opts["offset_align"] = val;
4258-
} else if (ceph_argparse_witharg(args, i, &val, "--read-percent", (char*)NULL)) {
4258+
} else if (ceph_argparse_witharg(args, i, &val, "--read-percent", (char*)nullptr)) {
42594259
opts["read-percent"] = val;
4260-
} else if (ceph_argparse_witharg(args, i, &val, "--num-objects", (char*)NULL)) {
4260+
} else if (ceph_argparse_witharg(args, i, &val, "--num-objects", (char*)nullptr)) {
42614261
opts["num-objects"] = val;
4262-
} else if (ceph_argparse_witharg(args, i, &val, "--run-length", (char*)NULL)) {
4262+
} else if (ceph_argparse_witharg(args, i, &val, "--run-length", (char*)nullptr)) {
42634263
opts["run-length"] = val;
4264-
} else if (ceph_argparse_witharg(args, i, &val, "--workers", (char*)NULL)) {
4264+
} else if (ceph_argparse_witharg(args, i, &val, "--workers", (char*)nullptr)) {
42654265
opts["workers"] = val;
4266-
} else if (ceph_argparse_witharg(args, i, &val, "-f", "--format", (char*)NULL)) {
4266+
} else if (ceph_argparse_witharg(args, i, &val, "-f", "--format", (char*)nullptr)) {
42674267
opts["format"] = val;
4268-
} else if (ceph_argparse_witharg(args, i, &val, "--lock-tag", (char*)NULL)) {
4268+
} else if (ceph_argparse_witharg(args, i, &val, "--lock-tag", (char*)nullptr)) {
42694269
opts["lock-tag"] = val;
4270-
} else if (ceph_argparse_witharg(args, i, &val, "--lock-cookie", (char*)NULL)) {
4270+
} else if (ceph_argparse_witharg(args, i, &val, "--lock-cookie", (char*)nullptr)) {
42714271
opts["lock-cookie"] = val;
4272-
} else if (ceph_argparse_witharg(args, i, &val, "--lock-description", (char*)NULL)) {
4272+
} else if (ceph_argparse_witharg(args, i, &val, "--lock-description", (char*)nullptr)) {
42734273
opts["lock-description"] = val;
4274-
} else if (ceph_argparse_witharg(args, i, &val, "--lock-duration", (char*)NULL)) {
4274+
} else if (ceph_argparse_witharg(args, i, &val, "--lock-duration", (char*)nullptr)) {
42754275
opts["lock-duration"] = val;
4276-
} else if (ceph_argparse_witharg(args, i, &val, "--lock-type", (char*)NULL)) {
4276+
} else if (ceph_argparse_witharg(args, i, &val, "--lock-type", (char*)nullptr)) {
42774277
opts["lock-type"] = val;
4278-
} else if (ceph_argparse_witharg(args, i, &val, "-N", "--namespace", (char*)NULL)) {
4278+
} else if (ceph_argparse_witharg(args, i, &val, "-N", "--namespace", (char*)nullptr)) {
42794279
opts["namespace"] = val;
4280-
} else if (ceph_argparse_flag(args, i, "--all", (char*)NULL)) {
4280+
} else if (ceph_argparse_flag(args, i, "--all", (char*)nullptr)) {
42814281
opts["all"] = "true";
4282-
} else if (ceph_argparse_flag(args, i, "--default", (char*)NULL)) {
4282+
} else if (ceph_argparse_flag(args, i, "--default", (char*)nullptr)) {
42834283
opts["default"] = "true";
4284-
} else if (ceph_argparse_witharg(args, i, &val, "-o", "--output", (char*)NULL)) {
4284+
} else if (ceph_argparse_witharg(args, i, &val, "-o", "--output", (char*)nullptr)) {
42854285
opts["output"] = val;
4286-
} else if (ceph_argparse_flag(args, i, "--write-omap", (char*)NULL)) {
4286+
} else if (ceph_argparse_flag(args, i, "--write-omap", (char*)nullptr)) {
42874287
// write- prefixed dests are legacy and have been deprecated
42884288
opts["dest-omap"] = "true";
4289-
} else if (ceph_argparse_flag(args, i, "--write-object", (char*)NULL)) {
4289+
} else if (ceph_argparse_flag(args, i, "--write-object", (char*)nullptr)) {
42904290
// write- prefixed dests are legacy and have been deprecated
42914291
opts["dest-obj"] = "true";
4292-
} else if (ceph_argparse_flag(args, i, "--write-xattr", (char*)NULL)) {
4292+
} else if (ceph_argparse_flag(args, i, "--write-xattr", (char*)nullptr)) {
42934293
// write- prefixed dests are legacy and have been deprecated
42944294
opts["dest-xattr"] = "true";
4295-
} else if (ceph_argparse_flag(args, i, "--omap", (char*)NULL)) {
4295+
} else if (ceph_argparse_flag(args, i, "--omap", (char*)nullptr)) {
42964296
opts["dest-omap"] = "true";
4297-
} else if (ceph_argparse_flag(args, i, "--object", (char*)NULL)) {
4297+
} else if (ceph_argparse_flag(args, i, "--object", (char*)nullptr)) {
42984298
opts["dest-obj"] = "true";
4299-
} else if (ceph_argparse_flag(args, i, "--xattr", (char*)NULL)) {
4299+
} else if (ceph_argparse_flag(args, i, "--xattr", (char*)nullptr)) {
43004300
opts["dest-xattr"] = "true";
4301-
} else if (ceph_argparse_flag(args, i, "--with-clones", (char*)NULL)) {
4301+
} else if (ceph_argparse_flag(args, i, "--with-clones", (char*)nullptr)) {
43024302
opts["with-clones"] = "true";
4303-
} else if (ceph_argparse_witharg(args, i, &val, "--omap-read-start-after", (char*)NULL)) {
4303+
} else if (ceph_argparse_witharg(args, i, &val, "--omap-read-start-after", (char*)nullptr)) {
43044304
opts["omap-read-start-after"] = val;
4305-
} else if (ceph_argparse_witharg(args, i, &val, "--omap-read-filter-prefix", (char*)NULL)) {
4305+
} else if (ceph_argparse_witharg(args, i, &val, "--omap-read-filter-prefix", (char*)nullptr)) {
43064306
opts["omap-read-filter-prefix"] = val;
4307-
} else if (ceph_argparse_witharg(args, i, &val, "--omap-read-max-return", (char*)NULL)) {
4307+
} else if (ceph_argparse_witharg(args, i, &val, "--omap-read-max-return", (char*)nullptr)) {
43084308
opts["omap-read-max-return"] = val;
4309-
} else if (ceph_argparse_witharg(args, i, &val, "--omap-key-file", (char*)NULL)) {
4309+
} else if (ceph_argparse_witharg(args, i, &val, "--omap-key-file", (char*)nullptr)) {
43104310
opts["omap-key-file"] = val;
4311-
} else if (ceph_argparse_witharg(args, i, &val, "--obj-name-file", (char*)NULL)) {
4311+
} else if (ceph_argparse_witharg(args, i, &val, "--obj-name-file", (char*)nullptr)) {
43124312
opts["obj-name-file"] = val;
4313-
} else if (ceph_argparse_flag(args, i, "--with-reference", (char*)NULL)) {
4313+
} else if (ceph_argparse_flag(args, i, "--with-reference", (char*)nullptr)) {
43144314
opts["with-reference"] = "true";
4315-
} else if (ceph_argparse_witharg(args, i, &val, "--pgid", (char*)NULL)) {
4315+
} else if (ceph_argparse_witharg(args, i, &val, "--pgid", (char*)nullptr)) {
43164316
opts["pgid"] = val;
4317-
} else if (ceph_argparse_witharg(args, i, &val, "--input-file", (char*)NULL)) {
4317+
} else if (ceph_argparse_witharg(args, i, &val, "--input-file", (char*)nullptr)) {
43184318
opts["input_file"] = val;
43194319
} else {
43204320
if (val[0] == '-')

0 commit comments

Comments
 (0)