Changeset: 6213b142e076 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6213b142e076
Modified Files:
gdk/gdk.h
gdk/gdk_bbp.c
Branch: default
Log Message:
A little cleanup.
Removed macros BBPstatus, BBPrefs, BBPcache, BBPname.
diffs (74 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1512,8 +1512,6 @@ BATsettrivprop(BAT *b)
* @tab BBPretain (bat bi)
* @item int
* @tab BBPrelease (bat bi)
- * @item str
- * @tab BBPname (bat bi)
* @item bat
* @tab BBPindex (str nme)
* @item BAT*
@@ -1596,12 +1594,6 @@ gdk_export BBPrec *BBP[N_BBPINIT];
#define BATgetId(b) BBP_logical((b)->batCacheid)
#define BBPvalid(i) (BBP_logical(i) != NULL && *BBP_logical(i) != '.')
-/* macros that nicely check parameters */
-#define BBPstatus(i) (BBPcheck(i) ? BBP_status(i) : 0)
-#define BBPrefs(i) (BBPcheck(i) ? BBP_refs(i) : -1)
-#define BBPcache(i) (BBPcheck(i) ? BBP_cache(i) : (BAT*) NULL)
-#define BBPname(i) (BBPcheck(i) ? BBP_logical(i) : "")
-
#define BBPRENAME_ALREADY (-1)
#define BBPRENAME_ILLEGAL (-2)
#define BBPRENAME_LONG (-3)
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3037,19 +3037,13 @@ BATdescriptor(bat i)
return b;
}
-static inline void
-GDKunshare(bat parent)
+void
+BBPunshare(bat parent)
{
(void) decref(parent, false, true, true, true, __func__);
(void) decref(parent, true, false, true, true, __func__);
}
-void
-BBPunshare(bat parent)
-{
- GDKunshare(parent);
-}
-
/*
* BBPreclaim is a user-exported function; the common way to destroy a
* BAT the hard way.
@@ -3227,9 +3221,9 @@ BBPdestroy(BAT *b)
/* parent released when completely done with child */
if (tp)
- GDKunshare(tp);
+ BBPunshare(tp);
if (vtp)
- GDKunshare(vtp);
+ BBPunshare(vtp);
}
static gdk_return
@@ -3256,9 +3250,9 @@ BBPfree(BAT *b)
/* parent released when completely done with child */
if (ret == GDK_SUCCEED && tp)
- GDKunshare(tp);
+ BBPunshare(tp);
if (ret == GDK_SUCCEED && vtp)
- GDKunshare(vtp);
+ BBPunshare(vtp);
return ret;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
