Mercurial > projects > pwm
changeset 4:b5c4267a7182
Fix check for successful deletion of a empty group
A return value of NULL means that there is no empty group of that name.
Improve the error message.
| author | Guido Berhoerster <guido+pwm@berhoerster.name> |
|---|---|
| date | Sun, 05 Feb 2017 13:30:31 +0100 |
| parents | 1cc98a5677d9 |
| children | 0b1bce8db371 |
| files | cmd.c pwfile.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cmd.c Sat Feb 04 22:06:15 2017 +0100 +++ b/cmd.c Sun Feb 05 13:30:31 2017 +0100 @@ -440,7 +440,7 @@ } if (pwfile_remove_group(ctx, argv[1]) != 0) { - fprintf(stderr, "group \"%s\" does not exist\n", argv[1]); + fprintf(stderr, "there is no empty group \"%s\"\n", argv[1]); return (CMD_ERR); }
--- a/pwfile.c Sat Feb 04 22:06:15 2017 +0100 +++ b/pwfile.c Sun Feb 05 13:30:31 2017 +0100 @@ -692,7 +692,7 @@ struct pws3_field *empty_group_field; empty_group_field = pws3_file_remove_empty_group(ctx->file, group); - if (empty_group_field != NULL) { + if (empty_group_field == NULL) { return (-1); } pws3_field_destroy(empty_group_field);