Changeset: b39e755b89c4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b39e755b89c4
Modified Files:
monetdb5/mal/mal.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_private.h
Branch: default
Log Message:
Cleaned unused definitions.
diffs (99 lines):
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -39,7 +39,6 @@ int have_hge;
#include "tablet.h"
MT_Lock mal_contextLock = MT_LOCK_INITIALIZER("mal_contextLock");
-MT_Lock mal_namespaceLock = MT_LOCK_INITIALIZER("mal_namespaceLk");
MT_Lock mal_remoteLock = MT_LOCK_INITIALIZER("mal_remoteLock");
MT_Lock mal_profileLock = MT_LOCK_INITIALIZER("mal_profileLock");
MT_Lock mal_copyLock = MT_LOCK_INITIALIZER("mal_copyLock");
diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -18,21 +18,22 @@
#define MAXIDENTIFIERS 4096
#define HASHMASK 4095
+MT_Lock mal_namespaceLock = MT_LOCK_INITIALIZER("mal_namespaceLk");
+
/* taken from gdk_atoms */
#define NME_HASH(_key,y,K)
\
- do {
\
- size_t _i;
\
- for (_i = y = 0; _i < K && _key[_i]; _i++) { \
- y += _key[_i];
\
- y += (y << 10);
\
- y ^= (y >> 6);
\
- }
\
- y += (y << 3);
\
- y ^= (y >> 11);
\
- y += (y << 15);
\
+ do {
\
+ size_t _i;
\
+ for (_i = y = 0; _i < K && _key[_i]; _i++) { \
+ y += _key[_i];
\
+ y += (y << 10);
\
+ y ^= (y >> 6);
\
+ }
\
+ y += (y << 3);
\
+ y ^= (y >> 11);
\
+ y += (y << 15);
\
y = y & HASHMASK;
\
- } while (0)
-
+ } while (0)
typedef struct NAME{
struct NAME *next;
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -35,21 +35,16 @@
__attribute__((__visibility__("hidden")));
__hidden str callFactory(Client cntxt, MalBlkPtr mb, ValPtr argv[],char flag)
__attribute__((__visibility__("hidden")));
-
#endif
__hidden void initResource(void)
__attribute__((__visibility__("hidden")));
-__hidden int moreClients(int reruns)
- __attribute__((__visibility__("hidden")));
__hidden str malAtomDefinition(str name,int tpe)
__attribute__((__visibility__("hidden")));
__hidden str malAtomProperty(MalBlkPtr mb, InstrPtr pci)
__attribute__((__visibility__("hidden")));
-__hidden extern MT_Lock mal_namespaceLock;
-
__hidden void setqptimeout(lng usecs)
__attribute__((__visibility__("hidden")));
@@ -58,11 +53,6 @@
__hidden void mdbExit(void)
__attribute__((__visibility__("hidden")));
-__hidden str createScriptException(MalBlkPtr, int, enum malexception,
- const char *, _In_z_ _Printf_format_string_ const char *, ...)
- __attribute__((__format__(__printf__, 5, 6)))
- __attribute__((__visibility__("hidden")));
-
#ifdef MAXSCOPE
/* MAXSCOPE is defined in the same file as Module */
__hidden Symbol cloneFunction(Module scope, Symbol proc, MalBlkPtr mb,
InstrPtr p)
@@ -75,12 +65,6 @@
__hidden void listFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg,
int first, int step)
__attribute__((__visibility__("hidden")));
-/* mal_http_daemon.h */
-__hidden void startHttpdaemon(void)
- __attribute__((__visibility__("hidden")));
-__hidden void stopHttpdaemon(void)
- __attribute__((__visibility__("hidden")));
-
/* mal_linker.h */
__hidden char *MSP_locate_script(const char *mod_name)
__attribute__((__visibility__("hidden")));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
