Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17479/src/server
Modified Files:
rel_xml.mx sql_xml.mx
Log Message:
clean-up:
removed unused (redundant) code
U sql_xml.mx
Index: sql_xml.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_xml.mx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sql_xml.mx 25 Aug 2008 13:36:18 -0000 1.9
+++ sql_xml.mx 5 Sep 2008 16:33:23 -0000 1.10
@@ -46,10 +46,8 @@
dnode *d = sym->data.lval->h;
char *tag = d->data.sval;
dlist *ns_attrs_elms = d->next->data.lval;
- lng returning = d->next->next->data.ival;
stmt *ns_st = NULL, *attr_st = NULL, *res = NULL;
- (void)returning;
if (ns_attrs_elms) {
symbol *ns = ns_attrs_elms->h->data.sym;
symbol *attr = ns_attrs_elms->h->next->data.sym;
@@ -59,9 +57,7 @@
if (content) {
dnode *n;
dlist *cl = content->h->data.lval;
- lng content_option = content->h->next->data.ival;
- (void)content_option;
for (n=cl->h; n; n = n->next) {
symbol *c = n->data.sym;
sql_subtype *st;
@@ -145,13 +141,8 @@
dnode *d = sym->data.lval->h;
symbol *ns = d->data.sym;
dlist *elms = d->next->data.lval;
- lng content_option = d->next->next->data.ival;
- lng returning = d->next->next->next->data.ival;
stmt *ns_st, *attr_st, *res = NULL;
- (void)content_option;
- (void)returning;
-
if (ns) {
ns_st = sql_value_exp(sql, scp, ns, grp, subset, f, knd);
} else {
@@ -216,10 +207,8 @@
{
dnode *d = sym->data.lval->h;
symbol *comment = d->data.sym;
- lng returning = d->next->data.ival;
stmt *comment_st;
- (void)returning;
comment_st = sql_value_exp(sql, scp, comment, grp, subset, f, knd);
if (!comment_st)
return NULL;
@@ -251,10 +240,8 @@
{
dnode *d = sym->data.lval->h;
dnode *en = d->data.lval->h;
- lng returning = d->next->data.ival;
stmt *concat_st, *res = NULL;
- (void)returning;
for (; en; en = en->next) {
symbol *c = en->data.sym;
concat_st = sql_value_exp(sql, scp, c, grp, subset, f, knd);
@@ -275,10 +262,8 @@
{
dnode *d = sym->data.lval->h;
symbol *val = d->data.sym;
- lng returning = d->next->data.ival;
stmt *val_st;
- (void)returning;
val_st = sql_value_exp(sql, scp, val, grp, subset, f, knd);
if (!val_st)
return NULL;
@@ -291,10 +276,8 @@
dnode *d = sym->data.lval->h;
char *target = d->data.sval;
symbol *val = d->next->data.sym;
- lng returning = d->next->next->data.ival;
stmt *target_st, *val_st;
- (void)returning;
target_st = stmt_atom_string(_strdup(target));
if (!val)
val_st = sql_value_exp(sql, scp, val, grp, subset, f, knd);
@@ -313,10 +296,8 @@
{
dnode *d = sym->data.lval->h;
symbol *text = d->data.sym;
- lng returning = d->next->data.ival;
stmt *text_st;
- (void)returning;
text_st = sql_value_exp(sql, scp, text, grp, subset, f, knd);
if (!text_st || (text_st = check_types(sql, &xml_type, text_st,
type_equal)) == NULL)
return NULL;
U rel_xml.mx
Index: rel_xml.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_xml.mx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rel_xml.mx 25 Aug 2008 13:36:16 -0000 1.3
+++ rel_xml.mx 5 Sep 2008 16:33:23 -0000 1.4
@@ -46,10 +46,8 @@
dnode *d = sym->data.lval->h;
char *tag = d->data.sval;
dlist *ns_attrs_elms = d->next->data.lval;
- lng returning = d->next->next->data.ival;
sql_exp *ns_st = NULL, *attr_st = NULL, *res = NULL;
- (void)returning;
if (ns_attrs_elms) {
symbol *ns = ns_attrs_elms->h->data.sym;
symbol *attr = ns_attrs_elms->h->next->data.sym;
@@ -59,9 +57,7 @@
if (content) {
dnode *n;
dlist *cl = content->h->data.lval;
- lng content_option = content->h->next->data.ival;
- (void)content_option;
for (n=cl->h; n; n = n->next) {
symbol *c = n->data.sym;
sql_subtype *st;
@@ -122,13 +118,8 @@
dnode *d = sym->data.lval->h;
symbol *ns = d->data.sym;
dlist *elms = d->next->data.lval;
- lng content_option = d->next->next->data.ival;
- lng returning = d->next->next->next->data.ival;
sql_exp *ns_st, *attr_st, *res = NULL;
- (void)content_option;
- (void)returning;
-
if (ns) {
ns_st = rel_value_exp(sql, rel, ns, f, knd);
} else {
@@ -192,10 +183,8 @@
{
dnode *d = sym->data.lval->h;
symbol *comment = d->data.sym;
- lng returning = d->next->data.ival;
sql_exp *comment_st;
- (void)returning;
comment_st = rel_value_exp(sql, rel, comment, f, knd);
if (!comment_st)
return NULL;
@@ -227,10 +216,8 @@
{
dnode *d = sym->data.lval->h;
dnode *en = d->data.lval->h;
- lng returning = d->next->data.ival;
sql_exp *concat_st, *res = NULL;
- (void)returning;
for (; en; en = en->next) {
symbol *c = en->data.sym;
concat_st = rel_value_exp(sql, rel, c, f, knd);
@@ -251,10 +238,8 @@
{
dnode *d = sym->data.lval->h;
symbol *val = d->data.sym;
- lng returning = d->next->data.ival;
sql_exp *val_st;
- (void)returning;
val_st = rel_value_exp(sql, rel, val, f, knd);
if (!val_st)
return NULL;
@@ -267,10 +252,8 @@
dnode *d = sym->data.lval->h;
char *target = d->data.sval;
symbol *val = d->next->data.sym;
- lng returning = d->next->next->data.ival;
sql_exp *target_st, *val_st;
- (void)returning;
target_st = exp_atom_str(target, &str_type);
if (!val)
val_st = rel_value_exp(sql, rel, val, f, knd);
@@ -289,10 +272,8 @@
{
dnode *d = sym->data.lval->h;
symbol *text = d->data.sym;
- lng returning = d->next->data.ival;
sql_exp *text_st;
- (void)returning;
text_st = rel_value_exp(sql, rel, text, f, knd);
if (!text_st || (text_st = rel_check_type(sql, &xml_type, text_st,
type_equal)) == NULL)
return NULL;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
