Changeset: 690d0a46e04e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=690d0a46e04e
Modified Files:
gdk/gdk.h
geom/monetdb5/geom.c
monetdb5/modules/atoms/blob.c
Branch: default
Log Message:
Cleanup: remove some now unused macros and a now unused function.
Unused since changeset 29a0b3ce1098.
diffs (60 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2466,15 +2466,6 @@ VALptr(const ValRecord *v)
#define FORCEMITOMASK (1<<29)
#define FORCEMITODEBUG if (GDKdebug & FORCEMITOMASK)
-#define short_int_SWAP(s) ((short)(((0x00ff&(s))<<8) | ((0xff00&(s))>>8)))
-
-#define normal_int_SWAP(i) (((0x000000ff&(i))<<24) | ((0x0000ff00&(i))<<8) | \
- ((0x00ff0000&(i))>>8) | ((0xff000000&(i))>>24))
-
-#define long_long_SWAP(l) \
- ((((lng)normal_int_SWAP(l))<<32) |\
- (0xffffffff&normal_int_SWAP(l>>32)))
-
/*
* The kernel maintains a central table of all active threads. They
* are indexed by their tid. The structure contains information on the
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -71,7 +71,6 @@ geom_export str wkbAsText(str *r, wkb **
geom_export void wkbDEL(Heap *h, var_t *index);
geom_export wkb *wkbREAD(wkb *a, stream *s, size_t cnt);
geom_export int wkbWRITE(wkb *a, stream *s, size_t cnt);
-geom_export void wkbCONVERT(wkb *b, int direction);
geom_export int wkbLENGTH(wkb *p);
geom_export void wkbHEAP(Heap *heap, size_t capacity);
geom_export var_t wkbPUT(Heap *h, var_t *bun, wkb *val);
@@ -584,13 +583,6 @@ wkbWRITE(wkb *a, stream *s, size_t cnt)
return GDK_SUCCEED;
}
-void
-wkbCONVERT(wkb *b, int direction)
-{
- (void) direction;
- b->len = normal_int_SWAP(b->len);
-}
-
int
wkbLENGTH(wkb *p)
{
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -169,12 +169,6 @@ blob_write(blob *a, stream *s, size_t cn
return GDK_SUCCEED;
}
-#if SIZEOF_SIZE_T == SIZEOF_INT
-#define normal_vart_SWAP(x) ((var_t) normal_int_SWAP((int)x))
-#else
-#define normal_vart_SWAP(x) ((var_t) long_long_SWAP((lng)x))
-#endif
-
static int
blob_length(blob *p)
{
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
