summaryrefslogtreecommitdiff
path: root/usr.bin/sort/sort.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2015-04-01 21:16:18 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2015-04-01 21:16:18 +0000
commitf5d777744dae2e04537525817bcf0d2cb12a460a (patch)
treed6199c21fd4355635f51c33a7c3f836cb5fb93b2 /usr.bin/sort/sort.c
parent7aef722d09728e16e15c19c5aff0442a479c21d2 (diff)
No need for if (x) free(x) style checks, this is not K&R.
Diffstat (limited to 'usr.bin/sort/sort.c')
-rw-r--r--usr.bin/sort/sort.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 7da8b00ab28..74dd3f64aa7 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sort.c,v 1.60 2015/04/01 21:13:07 millert Exp $ */
+/* $OpenBSD: sort.c,v 1.61 2015/04/01 21:16:17 millert Exp $ */
/*-
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
@@ -619,10 +619,8 @@ parse_pos(const char *s, struct key_specs *ks, bool *mef_flags, bool second)
end:
- if (c)
- sort_free(c);
- if (f)
- sort_free(f);
+ sort_free(c);
+ sort_free(f);
regfree(&re);
return ret;
@@ -739,10 +737,8 @@ parse_pos_obs(const char *s, size_t *nf, size_t *nc, char *sopts,
ret = 0;
end:
- if (c)
- sort_free(c);
- if (f)
- sort_free(f);
+ sort_free(c);
+ sort_free(f);
regfree(&re);
return ret;