Changeset: 5ea24c9e5b80 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ea24c9e5b80
Removed Files:
monetdb5/mal/mal_http_daemon.c
monetdb5/mal/mal_http_daemon.h
Modified Files:
clients/Tests/malcheck.stable.err
monetdb5/mal/Makefile.ag
Branch: default
Log Message:
Remove non-used code.
The role and inclusion of a http-daemain is left for the future.
diffs (104 lines):
diff --git a/clients/Tests/malcheck.stable.err
b/clients/Tests/malcheck.stable.err
--- a/clients/Tests/malcheck.stable.err
+++ b/clients/Tests/malcheck.stable.err
@@ -5,13 +5,6 @@ stderr of test 'malcheck` in directory '
# 15:15:51 > "./malcheck.sh" "malcheck"
# 15:15:51 >
-Traceback (most recent call last):
- File "<string>", line 1, in <module>
- File
"/export/scratch1/mk/default/Linux/lib/python2.7/site-packages/MonetDBtesting/malcheck.py",
line 200, in <module>
- process(f)
- File
"/export/scratch1/mk/default/Linux/lib/python2.7/site-packages/MonetDBtesting/malcheck.py",
line 75, in process
- data = open(f).read()
-IOError: [Errno 2] No such file or directory: 'monetdb5/mal/mal_properties.c'
# 15:16:26 >
# 15:16:26 > "Done."
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -9,8 +9,7 @@ INCLUDES = ../../common/options \
../../common/utils \
../../clients/mapilib \
../../gdk \
- $(READLINE_INCS) \
- $(libmicrohttpd_CFLAGS)
+ $(READLINE_INCS)
MTSAFE
lib_mal = {
@@ -26,7 +25,6 @@ lib_mal = {
mal_exception.c mal_exception.h \
mal_factory.c mal_factory.h \
mal_function.c mal_function.h \
- mal_http_daemon.c mal_http_daemon.h \
mal_import.c mal_import.h \
mal_runtime.c mal_runtime.h \
mal_instruction.c mal_instruction.h \
diff --git a/monetdb5/mal/mal_http_daemon.c b/monetdb5/mal/mal_http_daemon.c
deleted file mode 100644
--- a/monetdb5/mal/mal_http_daemon.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 2008-2015 MonetDB B.V.
- */
-
-/* (author) A. de Rijke
- * For documentation see website
- */
-
-#include "monetdb_config.h"
-
-#include "mal.h"
-#include "mal_exception.h"
-#include "mal_private.h"
-#include "mal_http_daemon.h"
-
-/* dummy noop functions to implement the exported API, if these had been
- * defined to return a str, we could have informed the caller no
- * implementation was available */
-
-void
-register_http_handler(http_request_handler handler)
-{
- (void)handler;
-}
-
-void
-startHttpdaemon(void)
-{
-}
-
-void
-stopHttpdaemon(void)
-{
-}
diff --git a/monetdb5/mal/mal_http_daemon.h b/monetdb5/mal/mal_http_daemon.h
deleted file mode 100644
--- a/monetdb5/mal/mal_http_daemon.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 2008-2015 MonetDB B.V.
- */
-
-#ifndef _MAL_HTTP_DAEMON_H_
-#define _MAL_HTTP_DAEMON_H_
-#include "mal.h"
-
-typedef int (*http_request_handler)
- (const char *url, const char *method, char **page, const char *);
-
-mal_export void register_http_handler(http_request_handler handler);
-
-#endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
