Changeset: d5fb5bd569a0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5fb5bd569a0
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_linker.h
Branch: default
Log Message:
Use const char * instead of str in functions signatures.
diffs (95 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1219,7 +1219,7 @@ void freeVariable(MalBlkPtr mb, int vari
void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag);
void garbageElement(Client cntxt, ValPtr v);
str generatorRef;
-MALfcn getAddress(str modname, str fcnname);
+MALfcn getAddress(const char *modname, const char *fcnname);
str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx);
ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k);
int getAtomIndex(const char *nme, size_t len, int deftpe);
@@ -1346,7 +1346,7 @@ str likeselectRef;
str likethetaselectRef;
str likeuselectRef;
str listRef;
-str loadLibrary(str modulename, int flag);
+str loadLibrary(const char *modulename, int flag);
char *locate_file(const char *basename, const char *ext, bit recurse);
str lockRef;
str lookupRef;
@@ -1361,8 +1361,8 @@ str malExtraModulesBoot(Client c, str ex
str malInclude(Client c, str name, int listing);
str malIncludeModules(Client c, char *modules[], int listing, int embedded);
str malIncludeString(Client c, const str name, const str mal, int listing,
MALfcn address);
-int malLibraryEnabled(str name);
-char *malLibraryHowToEnable(str name);
+int malLibraryEnabled(const char *name);
+char *malLibraryHowToEnable(const char *name);
int malProfileMode;
str malRef;
void mal_atom_reset(void);
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -65,7 +65,7 @@ fileexists(const char *path)
/* Search for occurrence of the function in the library identified by the
filename. */
MALfcn
-getAddress(str modname, str fcnname)
+getAddress(const char *modname, const char *fcnname)
{
void *dl;
MALfcn adr;
@@ -157,12 +157,12 @@ getAddress(str modname, str fcnname)
*/
str
-loadLibrary(str filename, int flag)
+loadLibrary(const char *filename, int flag)
{
int mode = RTLD_NOW | RTLD_GLOBAL;
char nme[FILENAME_MAX];
void *handle = NULL;
- str s;
+ const char *s;
int idx;
const char *mod_path = GDKgetenv("monet_mod_path");
int is_mod;
@@ -483,7 +483,7 @@ MSP_locate_sqlscript(const char *filenam
}
int
-malLibraryEnabled(str name)
+malLibraryEnabled(const char *name)
{
if (strcmp(name, "pyapi3") == 0 || strcmp(name, "pyapi3map") == 0) {
const char *val = GDKgetenv("embedded_py");
@@ -513,7 +513,7 @@ malLibraryEnabled(str name)
} while (0)
char *
-malLibraryHowToEnable(str name)
+malLibraryHowToEnable(const char *name)
{
if (strcmp(name, "pyapi3") == 0 || strcmp(name, "pyapi3map") == 0) {
HOW_TO_ENABLE_ERROR("Python 3", "embedded_py=3");
diff --git a/monetdb5/mal/mal_linker.h b/monetdb5/mal/mal_linker.h
--- a/monetdb5/mal/mal_linker.h
+++ b/monetdb5/mal/mal_linker.h
@@ -20,10 +20,10 @@
#define RTLD_GLOBAL 4
#endif
-mal_export MALfcn getAddress(str modname, str fcnname);
+mal_export MALfcn getAddress(const char *modname, const char *fcnname);
mal_export char *MSP_locate_sqlscript(const char *mod_name, bit recurse);
-mal_export str loadLibrary(str modulename, int flag);
+mal_export str loadLibrary(const char *modulename, int flag);
mal_export char *locate_file(const char *basename, const char *ext, bit
recurse);
-mal_export int malLibraryEnabled(str name);
-mal_export char* malLibraryHowToEnable(str name);
+mal_export int malLibraryEnabled(const char *name);
+mal_export char* malLibraryHowToEnable(const char *name);
#endif /* _MAL_LINKER_H */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
