diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-02-15 11:56:01 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-02-17 10:44:14 +0100 |
| commit | 574914f8d45e9ec9f9c2c8a9c83e338c4394c85c (patch) | |
| tree | 967dfd1811cb7138a7529e3cae7486debd03571a /ctdb/server/ctdb_lock_helper.c | |
| parent | adbdce78ecb4e852596108b69eeb8a4cba32fa83 (diff) | |
| download | samba-574914f8d45e9ec9f9c2c8a9c83e338c4394c85c.tar.gz | |
ctdb-locking: Remove unnecessary global variable
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/server/ctdb_lock_helper.c')
| -rw-r--r-- | ctdb/server/ctdb_lock_helper.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c index 8b9f5aa3bd8..f918b73dbd3 100644 --- a/ctdb/server/ctdb_lock_helper.c +++ b/ctdb/server/ctdb_lock_helper.c @@ -33,7 +33,6 @@ #include "common/system.h" -static char *progname = NULL; static bool realtime = true; struct lock_state { @@ -77,7 +76,7 @@ static void send_result(int fd, char result) } -static void usage(void) +static void usage(const char *progname) { fprintf(stderr, "\n"); fprintf(stderr, "Usage: %s <ctdbd-pid> <output-fd> RECORD <db-path> <db-flags> <db-key>\n", progname); @@ -276,10 +275,8 @@ int main(int argc, char *argv[]) reset_scheduler(); - progname = argv[0]; - if (argc < 4) { - usage(); + usage(argv[0]); exit(1); } @@ -306,7 +303,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "locking: Invalid number of arguments (%d)\n", argc); - usage(); + usage(argv[0]); exit(1); } result = lock_record(argv[4], argv[5], argv[6], &state); @@ -316,14 +313,14 @@ int main(int argc, char *argv[]) fprintf(stderr, "locking: Invalid number of arguments (%d)\n", argc); - usage(); + usage(argv[0]); exit(1); } result = lock_db(argv[4], argv[5], &state); } else { fprintf(stderr, "locking: Invalid lock-type '%s'\n", lock_type); - usage(); + usage(argv[0]); exit(1); } |