Merge branch 'dev' of /var/lib/git/libucore into dev

This commit is contained in:
Nils O. Selåsdal
2013-10-17 21:00:32 +02:00
4 changed files with 50 additions and 50 deletions
+3 -4
View File
@@ -65,8 +65,8 @@ struct RateLimit {
* @param tickets number of tickets (bucket depth)
* @param period per this period
*/
#define UC_RATELIMIT_INITIALIZER(tickets, period)\
{ tickets, period, tickets * period, 0}
#define UC_RATELIMIT_INITIALIZER(tickets)\
{ tickets, period, 0, -period}
@@ -79,9 +79,8 @@ struct RateLimit {
* @param r RateLimit to initialize
* @param tickets number of tickets (bucket depth)
* @param period per this period
* @param current_ts the current timestamp
*/
void uc_ratelimit_init(struct RateLimit *r, long tickets, long period, long current_ts);
void uc_ratelimit_init(struct RateLimit *r, long tickets, long period);
/**
* Reset a RateLimit, filling up the tickets again.