diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-02 23:03:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-02 23:03:02 +0100 |
| commit | 8b9646fee679b47520503b7eaafff9539a3ea3f2 (patch) | |
| tree | 4b71bdc7622635a101579c04b2d9e0c56991df2c /util-src/ringbuffer.c | |
| parent | 55ba289bedc1580f49af034b8a849958b698de77 (diff) | |
| parent | c0937dcdb42f9ac2fc928aa91f1474607b735590 (diff) | |
| download | prosody-8b9646fee679b47520503b7eaafff9539a3ea3f2.tar.gz prosody-8b9646fee679b47520503b7eaafff9539a3ea3f2.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util-src/ringbuffer.c')
| -rw-r--r-- | util-src/ringbuffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util-src/ringbuffer.c b/util-src/ringbuffer.c index 831b1fe2..2a13903c 100644 --- a/util-src/ringbuffer.c +++ b/util-src/ringbuffer.c @@ -31,7 +31,7 @@ void modpos(ringbuffer *b) { b->wpos = b->wpos % b->alen; } -int find(ringbuffer *b, const char *s, int l) { +int find(ringbuffer *b, const char *s, size_t l) { size_t i, j; int m; @@ -74,7 +74,7 @@ int rb_find(lua_State *L) { int rb_read(lua_State *L) { ringbuffer *b = luaL_checkudata(L, 1, "ringbuffer_mt"); - int r = luaL_checkinteger(L, 2); + size_t r = luaL_checkinteger(L, 2); int peek = lua_toboolean(L, 3); if(r > b->blen) { |