Changeset: 202b947b0d10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=202b947b0d10
Modified Files:
monetdb5/mal/mal.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_session.c
Branch: Jul2015
Log Message:
No point casting a void returning function to void.
diffs (62 lines):
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -154,12 +154,12 @@ void mal_exit(void){
GDKfree(mal_clients->bak);
if( mal_clients->fdin){
/* missing protection against closing stdin stream */
- (void) mnstr_close(mal_clients->fdin->s);
- (void) bstream_destroy(mal_clients->fdin);
+ mnstr_close(mal_clients->fdin->s);
+ bstream_destroy(mal_clients->fdin);
}
if( mal_clients->fdout && mal_clients->fdout != GDKstdout) {
- (void) mnstr_close(mal_clients->fdout);
- (void) mnstr_destroy(mal_clients->fdout);
+ mnstr_close(mal_clients->fdout);
+ mnstr_destroy(mal_clients->fdout);
}
#endif
/* deregister everything that was registered, ignore errors */
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -181,8 +181,8 @@ MCexitClient(Client c)
MPresetProfiler(c->fdout);
if (c->father == NULL) { /* normal client */
if (c->fdout && c->fdout != GDKstdout) {
- (void) mnstr_close(c->fdout);
- (void) mnstr_destroy(c->fdout);
+ mnstr_close(c->fdout);
+ mnstr_destroy(c->fdout);
}
assert(c->bak == NULL);
if (c->fdin) {
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -322,8 +322,8 @@ str
closeProfilerStream(void)
{
if (eventstream && eventstream != mal_clients[0].fdout && eventstream
!= GDKout && eventstream != GDKerr) {
- (void)mnstr_close(eventstream);
- (void)mnstr_destroy(eventstream);
+ mnstr_close(eventstream);
+ mnstr_destroy(eventstream);
}
eventstream = NULL;
malProfileMode = 0;
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -134,8 +134,8 @@ exit_streams( bstream *fin, stream *fout
{
if (fout && fout != GDKstdout) {
mnstr_flush(fout);
- (void) mnstr_close(fout);
- (void) mnstr_destroy(fout);
+ mnstr_close(fout);
+ mnstr_destroy(fout);
}
if (fin)
(void) bstream_destroy(fin);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
