From 6e7c4c6dfa78cebf99b2dc533e9e536c6a293d7a Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Wed, 28 Sep 2016 11:11:26 +0200 Subject: [PATCH 1/2] Add LICENSE file and mention in README.md Take the license from the .c sources and make it easier to be discovered. Fixes #32 --- LICENSE | 22 ++++++++++++++++++++++ README.md | 5 +++++ 2 files changed, 27 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..b2f6097 --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) +Copyright (C) 2012 Salvatore Sanfilippo. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/README.md b/README.md index 417337a..daed870 100644 --- a/README.md +++ b/README.md @@ -113,3 +113,8 @@ CREDITS This library was written by Salvatore Sanfilippo for Redis, but is maintained as a separated project by the author. Some of the test vectors in "test.lua" are obtained from the Javascript [MessagePack-JS library](https://github.com/cuzic/MessagePack-JS). + +LICENSE +--- +The library is published under the MIT License. See separate LICENSE file. + From 91fda98a296cb4277c051c759080483db558f83a Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Tue, 4 Oct 2016 11:12:45 +0200 Subject: [PATCH 2/2] Fix signed compilation warnings. Fixes #47 --- lua_cmsgpack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua_cmsgpack.c b/lua_cmsgpack.c index 90a388f..8a503f4 100644 --- a/lua_cmsgpack.c +++ b/lua_cmsgpack.c @@ -783,7 +783,7 @@ void mp_decode_to_lua_type(lua_State *L, mp_cur *c) { } } -int mp_unpack_full(lua_State *L, int limit, int offset) { +int mp_unpack_full(lua_State *L, int limit, size_t offset) { size_t len; const char *s; mp_cur c; @@ -888,7 +888,7 @@ const struct luaL_Reg cmds[] = { }; int luaopen_create(lua_State *L) { - int i; + unsigned i; /* Manually construct our module table instead of * relying on _register or _newlib */ lua_newtable(L); @@ -923,7 +923,7 @@ LUALIB_API int luaopen_cmsgpack(lua_State *L) { } LUALIB_API int luaopen_cmsgpack_safe(lua_State *L) { - int i; + unsigned i; luaopen_cmsgpack(L);