summaryrefslogtreecommitdiff
path: root/src/openvpn/integer.h
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
commit79f3537f69e125f19f59c36aa090120a63186a54 (patch)
tree2089a3b7dac990841dbc2e4d9b2f535b82dbb0af /src/openvpn/integer.h
parentf2137fedb30cb87448eb03b2f288920df6187571 (diff)
parent3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff)
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'src/openvpn/integer.h')
-rw-r--r--src/openvpn/integer.h102
1 files changed, 62 insertions, 40 deletions
diff --git a/src/openvpn/integer.h b/src/openvpn/integer.h
index f0fc196..bae8f16 100644
--- a/src/openvpn/integer.h
+++ b/src/openvpn/integer.h
@@ -5,7 +5,7 @@
* packet encryption, packet authentication, and
* packet compression.
*
- * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+ * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
@@ -32,34 +32,50 @@
*/
static inline int
-max_int (int x, int y)
+max_int(int x, int y)
{
- if (x > y)
- return x;
- else
- return y;
+ if (x > y)
+ {
+ return x;
+ }
+ else
+ {
+ return y;
+ }
}
static inline int
-min_int (int x, int y)
+min_int(int x, int y)
{
- if (x < y)
- return x;
- else
- return y;
+ if (x < y)
+ {
+ return x;
+ }
+ else
+ {
+ return y;
+ }
}
static inline int
-constrain_int (int x, int min, int max)
+constrain_int(int x, int min, int max)
{
- if (min > max)
- return min;
- if (x < min)
- return min;
- else if (x > max)
- return max;
- else
- return x;
+ if (min > max)
+ {
+ return min;
+ }
+ if (x < min)
+ {
+ return min;
+ }
+ else if (x > max)
+ {
+ return max;
+ }
+ else
+ {
+ return x;
+ }
}
/*
@@ -75,10 +91,10 @@ constrain_int (int x, int min, int max)
static inline int
modulo_subtract(int x, int y, int mod)
{
- const int d1 = x - y;
- const int d2 = (x > y ? -mod : mod) + d1;
- ASSERT (0 <= x && x < mod && 0 <= y && y < mod);
- return abs(d1) > abs(d2) ? d2 : d1;
+ const int d1 = x - y;
+ const int d2 = (x > y ? -mod : mod) + d1;
+ ASSERT(0 <= x && x < mod && 0 <= y && y < mod);
+ return abs(d1) > abs(d2) ? d2 : d1;
}
/*
@@ -90,25 +106,31 @@ modulo_subtract(int x, int y, int mod)
static inline int
modulo_add(int x, int y, int mod)
{
- int sum = x + y;
- ASSERT (0 <= x && x < mod && -mod <= y && y <= mod);
- if (sum >= mod)
- sum -= mod;
- if (sum < 0)
- sum += mod;
- return sum;
+ int sum = x + y;
+ ASSERT(0 <= x && x < mod && -mod <= y && y <= mod);
+ if (sum >= mod)
+ {
+ sum -= mod;
+ }
+ if (sum < 0)
+ {
+ sum += mod;
+ }
+ return sum;
}
static inline int
-index_verify (int index, int size, const char *file, int line)
+index_verify(int index, int size, const char *file, int line)
{
- if (index < 0 || index >= size)
- msg (M_FATAL, "Assertion Failed: Array index=%d out of bounds for array size=%d in %s:%d",
- index,
- size,
- file,
- line);
- return index;
+ if (index < 0 || index >= size)
+ {
+ msg(M_FATAL, "Assertion Failed: Array index=%d out of bounds for array size=%d in %s:%d",
+ index,
+ size,
+ file,
+ line);
+ }
+ return index;
}
-#endif
+#endif /* ifndef INTEGER_H */