From c787dccd9b5c3e55547a2c4bb598c0276de65034 Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy <roberto@inf.puc-rio.br> Date: Mon, 16 Aug 1999 17:52:00 -0300 Subject: "const" !!! --- lauxlib.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) (limited to 'lauxlib.c') diff --git a/lauxlib.c b/lauxlib.c index a7746bbe..9387a54a 100644 --- a/lauxlib.c +++ b/lauxlib.c @@ -1,5 +1,5 @@ /* -** $Id: lauxlib.c,v 1.16 1999/03/10 14:19:41 roberto Exp roberto $ +** $Id: lauxlib.c,v 1.17 1999/03/11 18:59:19 roberto Exp roberto $ ** Auxiliary functions for building Lua libraries ** See Copyright Notice in lua.h */ @@ -20,7 +20,7 @@ -int luaL_findstring (char *name, char *list[]) { +int luaL_findstring (const char *name, const char *const list[]) { int i; for (i=0; list[i]; i++) if (strcmp(list[i], name) == 0) @@ -28,9 +28,9 @@ int luaL_findstring (char *name, char *list[]) { return -1; /* name not found */ } -void luaL_argerror (int numarg, char *extramsg) { +void luaL_argerror (int numarg, const char *extramsg) { lua_Function f = lua_stackedfunction(0); - char *funcname; + const char *funcname; lua_getobjname(f, &funcname); numarg -= lua_nups(f); if (funcname == NULL) @@ -42,58 +42,50 @@ void luaL_argerror (int numarg, char *extramsg) { numarg, funcname, extramsg); } -char *luaL_check_lstr (int numArg, long *len) -{ +const char *luaL_check_lstr (int numArg, long *len) { lua_Object o = lua_getparam(numArg); luaL_arg_check(lua_isstring(o), numArg, "string expected"); if (len) *len = lua_strlen(o); return lua_getstring(o); } -char *luaL_opt_lstr (int numArg, char *def, long *len) -{ +const char *luaL_opt_lstr (int numArg, const char *def, long *len) { return (lua_getparam(numArg) == LUA_NOOBJECT) ? def : luaL_check_lstr(numArg, len); } -double luaL_check_number (int numArg) -{ +double luaL_check_number (int numArg) { lua_Object o = lua_getparam(numArg); luaL_arg_check(lua_isnumber(o), numArg, "number expected"); return lua_getnumber(o); } -double luaL_opt_number (int numArg, double def) -{ +double luaL_opt_number (int numArg, double def) { return (lua_getparam(numArg) == LUA_NOOBJECT) ? def : luaL_check_number(numArg); } -lua_Object luaL_tablearg (int arg) -{ +lua_Object luaL_tablearg (int arg) { lua_Object o = lua_getparam(arg); luaL_arg_check(lua_istable(o), arg, "table expected"); return o; } -lua_Object luaL_functionarg (int arg) -{ +lua_Object luaL_functionarg (int arg) { lua_Object o = lua_getparam(arg); luaL_arg_check(lua_isfunction(o), arg, "function expected"); return o; } -lua_Object luaL_nonnullarg (int numArg) -{ +lua_Object luaL_nonnullarg (int numArg) { lua_Object o = lua_getparam(numArg); luaL_arg_check(o != LUA_NOOBJECT, numArg, "value expected"); return o; } -void luaL_openlib (struct luaL_reg *l, int n) -{ +void luaL_openlib (const struct luaL_reg *l, int n) { int i; lua_open(); /* make sure lua is already open */ for (i=0; i<n; i++) @@ -101,8 +93,7 @@ void luaL_openlib (struct luaL_reg *l, int n) } -void luaL_verror (char *fmt, ...) -{ +void luaL_verror (const char *fmt, ...) { char buff[500]; va_list argp; va_start(argp, fmt); @@ -112,14 +103,14 @@ void luaL_verror (char *fmt, ...) } -void luaL_chunkid (char *out, char *source, int len) { +void luaL_chunkid (char *out, const char *source, int len) { len -= 13; /* 13 = strlen("string ''...\0") */ if (*source == '@') sprintf(out, "file `%.*s'", len, source+1); else if (*source == '(') strcpy(out, "(C code)"); else { - char *b = strchr(source , '\n'); /* stop string at first new line */ + const char *b = strchr(source , '\n'); /* stop string at first new line */ int lim = (b && (b-source)<len) ? b-source : len; sprintf(out, "string `%.*s'", lim, source); strcpy(out+lim+(13-5), "...'"); /* 5 = strlen("...'\0") */ @@ -127,7 +118,7 @@ void luaL_chunkid (char *out, char *source, int len) { } -void luaL_filesource (char *out, char *filename, int len) { +void luaL_filesource (char *out, const char *filename, int len) { if (filename == NULL) filename = "(stdin)"; sprintf(out, "@%.*s", len-2, filename); /* -2 for '@' and '\0' */ } -- cgit v1.2.3-55-g6feb