aboutsummaryrefslogtreecommitdiffstats
path: root/src/util
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2017-04-09 17:33:31 +0200
committerMattias Andrée <maandree@kth.se>2017-04-09 17:57:27 +0200
commitdeec79ce61b8661d3ad76f3ecc10a80d1ce19cdd (patch)
tree34a8863335a8eee38ec28419812e99a3c27cef64 /src/util
parentAdd blind-skip-pattern (diff)
downloadblind-deec79ce61b8661d3ad76f3ecc10a80d1ce19cdd.tar.gz
blind-deec79ce61b8661d3ad76f3ecc10a80d1ce19cdd.tar.bz2
blind-deec79ce61b8661d3ad76f3ecc10a80d1ce19cdd.tar.xz
Clean up
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-rw-r--r--src/util.c2
-rw-r--r--src/util.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/util.c b/src/util.c
index 92b4d20..21b2b69 100644
--- a/src/util.c
+++ b/src/util.c
@@ -162,7 +162,7 @@ writezeroes(int fd, void *buf, size_t bufsize, size_t n)
{
size_t p, m;
for (p = 0; p < n; p += m) {
- m = bufsize < n - p ? bufsize : n - p;
+ m = MIN(bufsize, n - p);
if (writeall(fd, buf, m))
return -1;
}
diff --git a/src/util.h b/src/util.h
index a9704ec..d948452 100644
--- a/src/util.h
+++ b/src/util.h
@@ -2,6 +2,9 @@
#include "arg.h"
#define ELEMENTSOF(ARRAY) (sizeof(ARRAY) / sizeof(*(ARRAY)))
+#define MIN(A, B) ((A) < (B) ? (A) : (B))
+#define MAX(A, B) ((A) > (B) ? (A) : (B))
+#define CLIP(A, B, C) ((B) < (A) ? (A) : (B) > (C) ? (C) : (B))
#define USAGE(SYNOPSIS)\
static void usage(void)\