StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

fix unused parameter warnings using (void)

Browse Source 
make sure signatures of macro declarations match
This commit is contained in:
ThePhD 2017-09-10 10:30:30 -04:00
parent 2ca0393a94
commit ae07a5dd67
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
single/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script.
// Generated 2017-09-10 08:09:11.282097 UTC
// This header was generated with sol v2.18.2 (revision a6d209f)
// Generated 2017-09-10 14:29:12.857783 UTC
// This header was generated with sol v2.18.2 (revision 2ca0393)
// https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP
@ -1694,10 +1694,10 @@ COMPAT53_API lua_Number lua_tonumberx (lua_State *L, int i, int *isnum);
COMPAT53_API void luaL_checkversion (lua_State *L);
#define luaL_loadfilex COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadfilex)
COMPAT53_API void luaL_loadfilex (lua_State *L);
COMPAT53_API void luaL_loadfilex (lua_State *L, const char *filename, const char *mode);
#define luaL_loadbufferx COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadbufferx)
COMPAT53_API void luaL_loadbufferx (lua_State *L);
COMPAT53_API void luaL_loadbufferx (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
#define luaL_checkstack COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkstack_53)
COMPAT53_API void luaL_checkstack (lua_State *L, int sp, const char *msg);
@ -1935,20 +1935,20 @@ COMPAT53_API void luaL_requiref (lua_State *L, const char *modname,
#if defined(__GLIBC__) || defined(_POSIX_VERSION) || defined(__APPLE__) || (!defined (__MINGW32__) && defined(__GNUC__) && (__GNUC__ < 6))
#ifndef COMPAT53_HAVE_STRERROR_R
#define COMPAT53_HAVE_STRERROR_R
#define COMPAT53_HAVE_STRERROR_R 1
#endif // have strerror_r
#if ((defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_XOPEN_SOURCE) || _XOPEN_SOURCE >= 600)) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
#ifndef COMPAT53_HAVE_STRERROR_R_XSI
#define COMPAT53_HAVE_STRERROR_R_XSI
#define COMPAT53_HAVE_STRERROR_R_XSI 1
#endif // XSI-Compliant strerror_r
#else
#ifndef COMPAT53_HAVE_STRERROR_R_GNU
#define COMPAT53_HAVE_STRERROR_R_GNU
#define COMPAT53_HAVE_STRERROR_R_GNU 1
#endif // GNU variant strerror_r
#endif // XSI/Posix vs. GNU strerror_r
#elif defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || defined(__STDC_LIB_EXT1__)
#ifndef COMPAT53_HAVE_STRERROR_S
#define COMPAT53_HAVE_STRERROR_S
#define COMPAT53_HAVE_STRERROR_S 1
#endif // GNU variant strerror_r
#endif // strerror_r vs. strerror_s vs. strerror usage
@ -2269,7 +2269,7 @@ COMPAT53_API void luaL_traceback (lua_State *L, lua_State *L1,
COMPAT53_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
const char* s = NULL;
int en = errno; /* calls to Lua API may change this value */
#if defined(COMPAT53_HAVE_STRERROR_R) || defined(COMPAT53_HAVE_STRERROR_S)
#if (defined(COMPAT53_HAVE_STRERROR_R) && COMPAT53_HAVE_STRERROR_R) || (defined(COMPAT53_HAVE_STRERROR_S) && COMPAT53_HAVE_STRERROR_S)
char buf[512] = { 0 };
#endif // buffer for threadsafe variants of strerror if possible
if (stat) {
@ -2288,7 +2288,7 @@ COMPAT53_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
/* GNU-specific which returns const char* */
s = strerror_r(en, buf, 512);
#endif
#elif defined(COMPAT53_HAVE_STRERROR_S)
#elif (defined(COMPAT53_HAVE_STRERROR_S) && COMPAT53_HAVE_STRERROR_S)
/* for MSVC and other C11 implementations, use strerror_s
* since it's provided by default by the libraries
*/
@ -2312,7 +2312,8 @@ COMPAT53_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
}
}
static const char* compat53_f_parser_handler (lua_State *, void *data, size_t *size) {
static const char* compat53_f_parser_handler (lua_State *L, void *data, size_t *size) {
(void)L; // better fix for unused parameter warnings
struct compat53_f_parser_buffer *p = (struct compat53_f_parser_buffer*)data;
size_t readcount = fread(p->buffer + p->start, sizeof(*p->buffer), sizeof(p->buffer), p->file);
if (ferror(p->file) != 0 || feof(p->file) != 0) {

15
sol/compatibility/compat-5.3.c
View File

@ -17,20 +17,20 @@
#if defined(__GLIBC__) || defined(_POSIX_VERSION) || defined(__APPLE__) || (!defined (__MINGW32__) && defined(__GNUC__) && (__GNUC__ < 6))
#ifndef COMPAT53_HAVE_STRERROR_R
#define COMPAT53_HAVE_STRERROR_R
#define COMPAT53_HAVE_STRERROR_R 1
#endif // have strerror_r
#if ((defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_XOPEN_SOURCE) || _XOPEN_SOURCE >= 600)) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
#ifndef COMPAT53_HAVE_STRERROR_R_XSI
#define COMPAT53_HAVE_STRERROR_R_XSI
#define COMPAT53_HAVE_STRERROR_R_XSI 1
#endif // XSI-Compliant strerror_r
#else
#ifndef COMPAT53_HAVE_STRERROR_R_GNU
#define COMPAT53_HAVE_STRERROR_R_GNU
#define COMPAT53_HAVE_STRERROR_R_GNU 1
#endif // GNU variant strerror_r
#endif // XSI/Posix vs. GNU strerror_r
#elif defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || defined(__STDC_LIB_EXT1__)
#ifndef COMPAT53_HAVE_STRERROR_S
#define COMPAT53_HAVE_STRERROR_S
#define COMPAT53_HAVE_STRERROR_S 1
#endif // GNU variant strerror_r
#endif // strerror_r vs. strerror_s vs. strerror usage
@ -369,7 +369,7 @@ COMPAT53_API void luaL_traceback (lua_State *L, lua_State *L1,
COMPAT53_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
const char* s = NULL;
int en = errno; /* calls to Lua API may change this value */
#if defined(COMPAT53_HAVE_STRERROR_R) || defined(COMPAT53_HAVE_STRERROR_S)
#if (defined(COMPAT53_HAVE_STRERROR_R) && COMPAT53_HAVE_STRERROR_R) || (defined(COMPAT53_HAVE_STRERROR_S) && COMPAT53_HAVE_STRERROR_S)
char buf[512] = { 0 };
#endif // buffer for threadsafe variants of strerror if possible
if (stat) {
@ -388,7 +388,7 @@ COMPAT53_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
/* GNU-specific which returns const char* */
s = strerror_r(en, buf, 512);
#endif
#elif defined(COMPAT53_HAVE_STRERROR_S)
#elif (defined(COMPAT53_HAVE_STRERROR_S) && COMPAT53_HAVE_STRERROR_S)
/* for MSVC and other C11 implementations, use strerror_s
* since it's provided by default by the libraries
*/
@ -413,7 +413,8 @@ COMPAT53_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
}
static const char* compat53_f_parser_handler (lua_State *, void *data, size_t *size) {
static const char* compat53_f_parser_handler (lua_State *L, void *data, size_t *size) {
(void)L; // better fix for unused parameter warnings
struct compat53_f_parser_buffer *p = (struct compat53_f_parser_buffer*)data;
size_t readcount = fread(p->buffer + p->start, sizeof(*p->buffer), sizeof(p->buffer), p->file);
if (ferror(p->file) != 0 || feof(p->file) != 0) {

4
sol/compatibility/compat-5.3.h
View File

@ -166,10 +166,10 @@ COMPAT53_API lua_Number lua_tonumberx (lua_State *L, int i, int *isnum);
COMPAT53_API void luaL_checkversion (lua_State *L);
#define luaL_loadfilex COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadfilex)
COMPAT53_API void luaL_loadfilex (lua_State *L);
COMPAT53_API void luaL_loadfilex (lua_State *L, const char *filename, const char *mode);
#define luaL_loadbufferx COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadbufferx)
COMPAT53_API void luaL_loadbufferx (lua_State *L);
COMPAT53_API void luaL_loadbufferx (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
#define luaL_checkstack COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkstack_53)
COMPAT53_API void luaL_checkstack (lua_State *L, int sp, const char *msg);