From 34c28896e87047d7888c407984598bdf861bbca1 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 21 Jan 2015 18:53:02 +0100 Subject: [PATCH] btrfs-progs: unify getopt table terminators Signed-off-by: David Sterba --- btrfs-corrupt-block.c | 2 +- cmds-balance.c | 4 ++-- cmds-device.c | 5 +++-- cmds-fi-disk_usage.c | 1 + cmds-filesystem.c | 3 ++- cmds-qgroup.c | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 64f515e..4f71227 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -1037,7 +1037,7 @@ int main(int ac, char **av) { "item", 0, NULL, 'I'}, { "dir-item", 0, NULL, 'D'}, { "delete", 0, NULL, 'd'}, - { 0, 0, 0, 0} + { NULL, 0, NULL, 0 } }; c = getopt_long(ac, av, "l:c:b:eEkuUi:f:x:m:K:IDd", long_options, diff --git a/cmds-balance.c b/cmds-balance.c index 7524f33..6d8861e 100644 --- a/cmds-balance.c +++ b/cmds-balance.c @@ -396,7 +396,7 @@ static int cmd_balance_start(int argc, char **argv) { "system", optional_argument, NULL, 's' }, { "force", no_argument, NULL, 'f' }, { "verbose", no_argument, NULL, 'v' }, - { NULL, no_argument, NULL, 0 }, + { NULL, 0, NULL, 0 } }; int opt = getopt_long(argc, argv, "d::s::m::fv", longopts, @@ -664,7 +664,7 @@ static int cmd_balance_status(int argc, char **argv) int longindex; static const struct option longopts[] = { { "verbose", no_argument, NULL, 'v' }, - { NULL, no_argument, NULL, 0} + { NULL, 0, NULL, 0 } }; int opt = getopt_long(argc, argv, "v", longopts, &longindex); diff --git a/cmds-device.c b/cmds-device.c index 5f7ad91..1c72e90 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -59,7 +59,7 @@ static int cmd_add_dev(int argc, char **argv) static const struct option long_options[] = { { "nodiscard", optional_argument, NULL, 'K'}, { "force", no_argument, NULL, 'f'}, - { 0, 0, 0, 0 } + { NULL, 0, NULL, 0} }; int c = getopt_long(argc, argv, "Kf", long_options, &long_index); @@ -216,7 +216,7 @@ static int cmd_scan_dev(int argc, char **argv) int long_index; static const struct option long_options[] = { { "all-devices", no_argument, NULL, 'd'}, - { 0, 0, 0, 0 }, + { NULL, 0, NULL, 0} }; int c = getopt_long(argc, argv, "d", long_options, &long_index); @@ -514,6 +514,7 @@ int cmd_device_usage(int argc, char **argv) { "iec", no_argument, NULL, GETOPT_VAL_IEC}, { "human-readable", no_argument, NULL, GETOPT_VAL_HUMAN_READABLE}, + { NULL, 0, NULL, 0 } }; int c = getopt_long(argc, argv, "bhHkmgt", long_options, &long_index); diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c index faf8698..27f9a4c 100644 --- a/cmds-fi-disk_usage.c +++ b/cmds-fi-disk_usage.c @@ -882,6 +882,7 @@ int cmd_filesystem_usage(int argc, char **argv) { "iec", no_argument, NULL, GETOPT_VAL_IEC}, { "human-readable", no_argument, NULL, GETOPT_VAL_HUMAN_READABLE}, + { NULL, 0, NULL, 0 } }; int c = getopt_long(argc, argv, "bhHkmgtT", long_options, &long_index); diff --git a/cmds-filesystem.c b/cmds-filesystem.c index ec422e3..528fda3 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -221,6 +221,7 @@ static int cmd_filesystem_df(int argc, char **argv) { "iec", no_argument, NULL, GETOPT_VAL_IEC}, { "human-readable", no_argument, NULL, GETOPT_VAL_HUMAN_READABLE}, + { NULL, 0, NULL, 0 } }; int c = getopt_long(argc, argv, "bhHkmgt", long_options, &long_index); @@ -841,7 +842,7 @@ static int cmd_show(int argc, char **argv) static const struct option long_options[] = { { "all-devices", no_argument, NULL, 'd'}, { "mounted", no_argument, NULL, 'm'}, - { NULL, no_argument, NULL, 0 }, + { NULL, 0, NULL, 0 } }; int c = getopt_long(argc, argv, "dm", long_options, &long_index); diff --git a/cmds-qgroup.c b/cmds-qgroup.c index 456f06e..5cc8619 100644 --- a/cmds-qgroup.c +++ b/cmds-qgroup.c @@ -264,7 +264,7 @@ static int cmd_qgroup_show(int argc, char **argv) {"iec", no_argument, NULL, GETOPT_VAL_IEC}, { "human-readable", no_argument, NULL, GETOPT_VAL_HUMAN_READABLE}, - {0, 0, 0, 0} + { NULL, 0, NULL, 0 } }; c = getopt_long(argc, argv, "pcreFf", long_options, &option_index); -- 2.7.4