Changeset: 2fe8c79b23c6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2fe8c79b23c6
Added Files:
sql/backends/monet5/vaults/miniseed/71_registrar.sql
Removed Files:
sql/backends/monet5/vaults/miniseed/71_registrar.slq
Modified Files:
sql/backends/monet5/vaults/miniseed/miniseed.c
sql/backends/monet5/vaults/miniseed/registrar.c
Branch: DataVaults
Log Message:
Fix mseed compilation
Avoid self-assignment
diffs (42 lines):
diff --git a/sql/backends/monet5/vaults/miniseed/71_registrar.slq
b/sql/backends/monet5/vaults/miniseed/71_registrar.sql
rename from sql/backends/monet5/vaults/miniseed/71_registrar.slq
rename to sql/backends/monet5/vaults/miniseed/71_registrar.sql
diff --git a/sql/backends/monet5/vaults/miniseed/miniseed.c
b/sql/backends/monet5/vaults/miniseed/miniseed.c
--- a/sql/backends/monet5/vaults/miniseed/miniseed.c
+++ b/sql/backends/monet5/vaults/miniseed/miniseed.c
@@ -33,8 +33,8 @@ str MiniseedMount(Client cntxt, MalBlkPt
ret[r] = (int*) getArgReference(stk,pci,r);
}
- cntxt = cntxt; /* to escape 'unused' parameter error. */
- mb = mb; /* to escape 'unused' parameter error. */
+ (void)cntxt; /* to escape 'unused' parameter error. */
+ (void)mb; /* to escape 'unused' parameter error. */
bfile = BATnew(TYPE_void, TYPE_int, 0, PERSISTENT); /* create empty BAT
for ret0. */
if ( bfile == NULL)
@@ -154,8 +154,8 @@ str MiniseedMountSegmentMode(Client cntx
ret[r] = (int*) getArgReference(stk,pci,r);
}
- cntxt = cntxt; /* to escape 'unused' parameter error. */
- mb = mb; /* to escape 'unused' parameter error. */
+ (void)cntxt; /* to escape 'unused' parameter error. */
+ (void)mb; /* to escape 'unused' parameter error. */
bfile = BATnew(TYPE_void, TYPE_int, 0, PERSISTENT); /* create empty BAT
for ret0. */
if ( bfile == NULL)
diff --git a/sql/backends/monet5/vaults/miniseed/registrar.c
b/sql/backends/monet5/vaults/miniseed/registrar.c
--- a/sql/backends/monet5/vaults/miniseed/registrar.c
+++ b/sql/backends/monet5/vaults/miniseed/registrar.c
@@ -2138,8 +2138,8 @@ str register_table(Client cntxt, MalBlkP
temp_container *tc = (temp_container*) (size_t) ticket; /* filled
temp_container taken */
- cntxt = cntxt; /* to escape 'unused' parameter error. */
- mb = mb; /* to escape 'unused' parameter error. */
+ (void)cntxt; /* to escape 'unused' parameter error. */
+ (void)mb; /* to escape 'unused' parameter error. */
if(pci->retc != tc->num_columns[table_idx])
{/* inconsistency in the number of return BATs, what to do */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
