Changeset: 1e82ca65038c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1e82ca65038c
Modified Files:
sql/server/rel_remote.c
sql/server/rel_remote.h
Branch: odbc_loader
Log Message:
Add sa_msettings_create()
diffs (52 lines):
diff --git a/sql/server/rel_remote.c b/sql/server/rel_remote.c
--- a/sql/server/rel_remote.c
+++ b/sql/server/rel_remote.c
@@ -12,6 +12,34 @@
#include "monetdb_config.h"
#include "rel_remote.h"
+#include "msettings.h"
+
+static void *
+msettings_sa_allocator(void *state, void *old, size_t size)
+{
+ allocator *sa = state;
+
+ if (size == 0) {
+ // This is really a free(), ignore it.
+ return NULL;
+ } else if (old == NULL) {
+ // This is really a malloc()
+ return sa_alloc(sa, size);
+ } else {
+ // We can't handle generic realloc because we don't know how
large the
+ // previous allocation was, so we don't know how much to copy.
+ // Fortunately, msettings doesn't really reallocate so we don't
need
+ // this for now.
+ assert(size == 0 || old == NULL);
+ return NULL;
+ }
+}
+
+msettings *
+sa_msettings_create(allocator *sa)
+{
+ return msettings_create_with(msettings_sa_allocator, sa);
+}
#define mapi_prefix "mapi:"
#define monetdb_prefix "monetdb"
diff --git a/sql/server/rel_remote.h b/sql/server/rel_remote.h
--- a/sql/server/rel_remote.h
+++ b/sql/server/rel_remote.h
@@ -14,6 +14,10 @@
#define _REL_REMOTE_H_
#include "sql_relation.h"
+#include "msettings.h"
+
+// maybe this needs to be somewhere more global?
+extern msettings *sa_msettings_create(allocator *sa);
sql_export int mapiuri_valid( const char *uri);
extern const char *mapiuri_uri(const char *uri, allocator *sa);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
