Changeset: 779ee6f7367b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=779ee6f7367b Modified Files: clients/Tests/exports.stable.out gdk/ChangeLog gdk/gdk.h gdk/gdk_storage.c Branch: default Log Message:
Removed function BATprintf. diffs (71 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -159,7 +159,6 @@ gdk_return BATorderidx(BAT *b, int stabl gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate); gdk_return BATprint(BAT *b); gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]); -gdk_return BATprintf(stream *f, BAT *b); gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, int skip_nils, int abort_on_error, int nil_if_empty); BAT *BATproject(BAT *l, BAT *r); BAT *BATprojectchain(BAT **bats); diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -2,6 +2,7 @@ # This file is updated with Maddlog * Mon Jan 30 2017 Sjoerd Mullender <[email protected]> +- Removed function BATprintf. Use BATprint or BATprintcolumns instead. - Removed BATsave from the list of exported functions. * Tue Jan 3 2017 Sjoerd Mullender <[email protected]> diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1503,8 +1503,6 @@ gdk_export void OIDXdestroy(BAT *b); * @- Printing * @multitable @columnfractions 0.08 0.7 * @item int - * @tab BATprintf (stream *f, BAT *b) - * @item int * @tab BATprintcolumns (stream *f, int argc, BAT *b[]); * @end multitable * @@ -1516,7 +1514,6 @@ gdk_export void OIDXdestroy(BAT *b); */ gdk_export gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]); gdk_export gdk_return BATprint(BAT *b); -gdk_export gdk_return BATprintf(stream *f, BAT *b); /* * @- BAT clustering diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c --- a/gdk/gdk_storage.c +++ b/gdk/gdk_storage.c @@ -956,7 +956,7 @@ BATprintcolumns(stream *s, int argc, BAT } gdk_return -BATprintf(stream *s, BAT *b) +BATprint(BAT *b) { BAT *argv[2]; gdk_return ret = GDK_FAIL; @@ -965,15 +965,9 @@ BATprintf(stream *s, BAT *b) argv[1] = b; if (argv[0] && argv[1]) { BATroles(argv[0], "h"); - ret = BATprintcolumns(s, 2, argv); + ret = BATprintcolumns(GDKstdout, 2, argv); } if (argv[0]) BBPunfix(argv[0]->batCacheid); return ret; } - -gdk_return -BATprint(BAT *b) -{ - return BATprintf(GDKstdout, b); -} _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
