Skip to content

Commit

Permalink
fix return type of getopt_long
Browse files Browse the repository at this point in the history
On some platforms this manifested as an inability to parse command line
arguments and login.  Fixes:

lpass.c:58:2: warning: comparison is always true due to limited range of
data type [-Wtype-limits]
  while ((option = getopt_long(argc, argv, "vh", long_options,
&option_index)) != -1) {
  ^
Signed-off-by: Bob Copeland <[email protected]>
  • Loading branch information
Bob Copeland committed Oct 28, 2014
1 parent 65334f7 commit bcfbb24
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cmd-duplicate.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int cmd_duplicate(int argc, char **argv)
{"sync", required_argument, NULL, 'S'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
char *name;
enum blobsync sync = BLOB_SYNC_AUTO;
Expand Down
2 changes: 1 addition & 1 deletion cmd-edit.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ int cmd_edit(int argc, char **argv)
{"non-interactive", no_argument, NULL, 'X'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
enum { NONE, USERNAME, PASSWORD, URL, FIELD, NAME, NOTES } choice = NONE;
_cleanup_free_ char *field = NULL;
Expand Down
2 changes: 1 addition & 1 deletion cmd-export.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int cmd_export(int argc, char **argv)
{"csv", required_argument, NULL, 'C'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
enum blobsync sync = BLOB_SYNC_AUTO;
enum { CSV } choice = CSV;
Expand Down
2 changes: 1 addition & 1 deletion cmd-login.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int cmd_login(int argc, char **argv)
{"force", no_argument, NULL, 'f'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
bool trust = false;
bool plaintext_key = false;
Expand Down
2 changes: 1 addition & 1 deletion cmd-logout.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ int cmd_logout(int argc, char **argv)
{"force", no_argument, NULL, 'f'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
bool force = false;
struct session *session = NULL;
Expand Down
2 changes: 1 addition & 1 deletion cmd-ls.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ int cmd_ls(int argc, char **argv)
{"sync", required_argument, NULL, 'S'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
char *group = NULL;
int group_len;
Expand Down
2 changes: 1 addition & 1 deletion cmd-rm.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int cmd_rm(int argc, char **argv)
{"sync", required_argument, NULL, 'S'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
char *name;
enum blobsync sync = BLOB_SYNC_AUTO;
Expand Down
2 changes: 1 addition & 1 deletion cmd-show.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int cmd_show(int argc, char **argv)
{"clip", no_argument, NULL, 'c'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
enum { ALL, USERNAME, PASSWORD, URL, FIELD, ID, NAME, NOTES } choice = ALL;
_cleanup_free_ char *field = NULL;
Expand Down
2 changes: 1 addition & 1 deletion cmd-sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int cmd_sync(int argc, char **argv)
{"background", no_argument, NULL, 'b'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;
bool background = false;

Expand Down
2 changes: 1 addition & 1 deletion lpass.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static int global_options(int argc, char *argv[])
{"help", no_argument, NULL, 'h'},
{0, 0, 0, 0}
};
char option;
int option;
int option_index;

while ((option = getopt_long(argc, argv, "vh", long_options, &option_index)) != -1) {
Expand Down

0 comments on commit bcfbb24

Please sign in to comment.