[libgda] Removed redundant tools/binreloc
- From: Vivien Malerba <vivien src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libgda] Removed redundant tools/binreloc
- Date: Fri, 18 Sep 2009 18:38:47 +0000 (UTC)
commit 52394ddf1ff30a6fecd5f1748b3a40ecd7b501dd
Author: Vivien Malerba <malerba gnome-db org>
Date: Tue Sep 15 19:34:26 2009 +0200
Removed redundant tools/binreloc
configure.in | 1 -
libgda-ui/marshallers/gdaui-custom-marshal.c | 311 ------------
libgda-ui/marshallers/gdaui-custom-marshal.h | 80 ---
tools/Makefile.am | 3 +-
tools/binreloc/Makefile.am | 22 -
tools/binreloc/binreloc.c | 696 --------------------------
tools/binreloc/binreloc.h | 73 ---
tools/binreloc/sql-binreloc.c | 261 ----------
tools/binreloc/sql-binreloc.h | 49 --
tools/gda-sql.c | 2 -
tools/web-server.c | 4 +-
11 files changed, 3 insertions(+), 1499 deletions(-)
---
diff --git a/configure.in b/configure.in
index 52d8273..1c57492 100644
--- a/configure.in
+++ b/configure.in
@@ -1753,7 +1753,6 @@ tools/browser/query-exec/Makefile
tools/browser/dummy-perspective/Makefile
tools/browser/canvas/Makefile
tools/browser/doc/Makefile
-tools/binreloc/Makefile
testing/Makefile
tests/Makefile
tests/parser/Makefile
diff --git a/libgda-ui/marshallers/gdaui-custom-marshal.c b/libgda-ui/marshallers/gdaui-custom-marshal.c
index 1d25910..409549d 100644
--- a/libgda-ui/marshallers/gdaui-custom-marshal.c
+++ b/libgda-ui/marshallers/gdaui-custom-marshal.c
@@ -95,314 +95,3 @@ _gdaui_marshal_VOID__STRING_SLIST_SLIST (GClosure *closure,
data2);
}
-
-
-
-
-
-void
-_gda_marshal_VOID__GTYPE_GTYPE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__GTYPE_GTYPE) (gpointer data1,
- GType arg_1,
- GType arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__GTYPE_GTYPE callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 3);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__GTYPE_GTYPE) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_value_get_gtype (param_values + 1),
- g_value_get_gtype (param_values + 2),
- data2);
-}
-
-void
-_gda_marshal_ERROR__OBJECT_VALUE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef GError *(*GMarshalFunc_ERROR__OBJECT_VALUE) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer data2);
- register GMarshalFunc_ERROR__OBJECT_VALUE callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- GError *v_return;
-
- g_return_if_fail (n_param_values == 3);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_ERROR__OBJECT_VALUE) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_value_get_object (param_values + 1),
- g_value_get_boxed (param_values + 2),
- data2);
- g_value_take_boxed (return_value, v_return);
-}
-
-void
-_gda_marshal_VOID__OBJECT_STRING_VALUE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__OBJECT_STRING_VALUE) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer data2);
- register GMarshalFunc_VOID__OBJECT_STRING_VALUE callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 4);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__OBJECT_STRING_VALUE) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_value_get_object (param_values + 1),
- (gpointer) g_value_get_string (param_values + 2),
- g_value_get_boxed (param_values + 3),
- data2);
-}
-
-void
-_gda_marshal_ERROR__VOID (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef GError *(*GMarshalFunc_ERROR__VOID) (gpointer data1,
- gpointer data2);
- register GMarshalFunc_ERROR__VOID callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- GError *v_return;
-
- g_return_if_fail (n_param_values == 1);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_ERROR__VOID) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1, data2);
- g_value_take_boxed (return_value, v_return);
-}
-
-void
-_gda_marshal_VOID__STRING_VALUE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__STRING_VALUE) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__STRING_VALUE callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 3);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__STRING_VALUE) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- (gpointer) g_value_get_string (param_values + 1),
- g_value_get_boxed (param_values + 2),
- data2);
-}
-
-void
-_gda_marshal_ERROR__VALUE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef GError *(*GMarshalFunc_ERROR__VALUE) (gpointer data1,
- gpointer arg_1,
- gpointer data2);
- register GMarshalFunc_ERROR__VALUE callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- GError *v_return;
-
- g_return_if_fail (n_param_values == 2);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_ERROR__VALUE) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_value_get_boxed (param_values + 1),
- data2);
- g_value_take_boxed (return_value, v_return);
-}
-
-void
-_gda_marshal_ERROR__INT_INT (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef GError *(*GMarshalFunc_ERROR__INT_INT) (gpointer data1,
- gint arg_1,
- gint arg_2,
- gpointer data2);
- register GMarshalFunc_ERROR__INT_INT callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- GError *v_return;
-
- g_return_if_fail (n_param_values == 3);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_ERROR__INT_INT) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_value_get_int (param_values + 1),
- g_value_get_int (param_values + 2),
- data2);
- g_value_take_boxed (return_value, v_return);
-}
-
-void
-_gda_marshal_VOID__SLIST (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__SLIST) (gpointer data1,
- gpointer arg_1,
- gpointer data2);
- register GMarshalFunc_VOID__SLIST callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 2);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__SLIST) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_value_get_pointer (param_values + 1),
- data2);
-}
-
-void
-_gda_marshal_ERROR__METACONTEXT (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef GError *(*GMarshalFunc_ERROR__METACONTEXT) (gpointer data1,
- gpointer arg_1,
- gpointer data2);
- register GMarshalFunc_ERROR__METACONTEXT callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- GError *v_return;
-
- g_return_if_fail (n_param_values == 2);
-
- if (G_CCLOSURE_SWAP_DATA (closure)) {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_ERROR__METACONTEXT) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_value_get_pointer (param_values + 1),
- data2);
- g_value_take_boxed (return_value, v_return);
-}
diff --git a/libgda-ui/marshallers/gdaui-custom-marshal.h b/libgda-ui/marshallers/gdaui-custom-marshal.h
index 2d1784b..8e12ead 100644
--- a/libgda-ui/marshallers/gdaui-custom-marshal.h
+++ b/libgda-ui/marshallers/gdaui-custom-marshal.h
@@ -45,86 +45,6 @@ _gdaui_marshal_VOID__STRING_SLIST_SLIST (GClosure *closure,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data);
-
-
-
-
-
-
-
-/* ERROR:OBJECT,VALUE */
-void
-_gda_marshal_ERROR__OBJECT_VALUE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data);
-
-/* VOID:OBJECT,STRING,VALUE */
-void
-_gda_marshal_VOID__OBJECT_STRING_VALUE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data);
-
-/* ERROR:VOID */
-void
-_gda_marshal_ERROR__VOID (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data);
-
-
-/* VOID:STRING,VALUE */
-void
-_gda_marshal_VOID__STRING_VALUE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data);
-
-/* ERROR:VALUE */
-void
-_gda_marshal_ERROR__VALUE (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data);
-
-/* ERROR:INT,INT */
-void
-_gda_marshal_ERROR__INT_INT (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data);
-
-/* VOID:SLIST */
-void
-_gda_marshal_VOID__SLIST (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data);
-
-/* ERROR:GdaMetaContext */
-void
-_gda_marshal_ERROR__METACONTEXT (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data);
-
G_END_DECLS
#endif
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6e1c5e7..4873813 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,7 +2,7 @@ if HAVE_UI
BROWSER_DIR=browser
endif
-SUBDIRS = binreloc $(BROWSER_DIR)
+SUBDIRS = $(BROWSER_DIR)
bin_PROGRAMS = \
gda-list-config-4.0 \
@@ -42,7 +42,6 @@ gda_sql_4_0_SOURCES = \
gda_sql_4_0_LDADD = \
$(top_builddir)/libgda/libgda-4.0.la \
- binreloc/libgdasql_binreloc-4.0.la \
$(LIBGDA_LIBS) \
$(READLINE_LIB) \
$(HISTORY_LIB)
diff --git a/tools/gda-sql.c b/tools/gda-sql.c
index 077ae51..5c03a08 100644
--- a/tools/gda-sql.c
+++ b/tools/gda-sql.c
@@ -35,7 +35,6 @@
#include <libgda/gda-quark-list.h>
#include <libgda/gda-meta-struct.h>
#include <libgda/gda-blob-op.h>
-#include "binreloc/sql-binreloc.h"
#ifndef G_OS_WIN32
#include <signal.h>
@@ -178,7 +177,6 @@ main (int argc, char *argv[])
}
gda_init ();
- sql_gbr_init ();
has_threads = g_thread_supported ();
data = g_new0 (MainData, 1);
diff --git a/tools/web-server.c b/tools/web-server.c
index 80e3483..544fe87 100644
--- a/tools/web-server.c
+++ b/tools/web-server.c
@@ -27,7 +27,7 @@
#include "web-server.h"
#include <libsoup/soup.h>
#include "html-doc.h"
-#include "binreloc/sql-binreloc.h"
+#include <libgda/binreloc/gda-binreloc.h>
/* Use the RSA reference implementation included in the RFC-1321, http://www.freesoft.org/CIE/RFC/1321/ */
#include "global.h"
@@ -444,7 +444,7 @@ get_file (WebServer *server, SoupMessage *msg, const char *path, GError **error)
GMappedFile *mfile;
gchar *real_path;
- real_path = sql_gbr_get_file_path (SQL_DATA_DIR, "libgda-4.0", "web", path, NULL);
+ real_path = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-4.0", "web", path, NULL);
if (!real_path)
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
