Skip to content

Commit 3a8ca97

Browse files
committedApr 25, 2018
Make can_add_ulong_within return an int; it's a predicate.
The unsigned long doesn't make sense, and also it would cause conversion warnings in ulong_add_capped.
1 parent cc91129 commit 3a8ca97

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎src/common.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static inline int can_ulong_add(const unsigned long x,
120120
const unsigned long y) __ATTR_CONST;
121121
static inline unsigned long ulong_add(const unsigned long x,
122122
const unsigned long y) __ATTR_CONST;
123-
static inline unsigned long can_add_ulong_within(const unsigned long x,
123+
static inline int can_add_ulong_within(const unsigned long x,
124124
const unsigned long y, const unsigned long cap) __ATTR_CONST;
125125
static inline unsigned long ulong_add_capped(const unsigned long x,
126126
const unsigned long y, const unsigned long cap) __ATTR_CONST;
@@ -178,7 +178,7 @@ static inline unsigned long ulong_add(const unsigned long x,
178178
/*
179179
* Check whether two unsigned long can be added within a cap.
180180
*/
181-
static inline unsigned long can_add_ulong_within(const unsigned long x,
181+
static inline int can_add_ulong_within(const unsigned long x,
182182
const unsigned long y, const unsigned long cap)
183183
{
184184
return y <= cap && x <= cap && x <= (cap - y);

0 commit comments

Comments
 (0)