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 | 8407f360939fe103a991641b0bf3b85e87d660b9 (patch) | |
| tree | 4b71bdc7622635a101579c04b2d9e0c56991df2c /util-src/ringbuffer.c | |
| parent | a11a584a59cde70ce4f0880049b9e675d8b2e223 (diff) | |
| parent | fdf81e53aa57c68f330deecf4f97cfefb05f5044 (diff) | |
| download | prosody-8407f360939fe103a991641b0bf3b85e87d660b9.tar.gz prosody-8407f360939fe103a991641b0bf3b85e87d660b9.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) { |