MonetDB: default - Clean up VALget and VALptr functions.

[Sjoerd Mullender]

Changeset: 4c7199754816 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c7199754816
Modified Files:
        gdk/gdk.h
        gdk/gdk_value.c
Branch: default
Log Message:

Clean up VALget and VALptr functions.


diffs (55 lines):

diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2301,14 +2301,9 @@ VALptr(const ValRecord *v)
 {
        switch (ATOMstorage(v->vtype)) {
        case TYPE_void: return (const void *) &v->val.oval;
-       case TYPE_bit: return (const void *) &v->val.btval;
        case TYPE_bte: return (const void *) &v->val.btval;
        case TYPE_sht: return (const void *) &v->val.shval;
-       case TYPE_bat: return (const void *) &v->val.bval;
        case TYPE_int: return (const void *) &v->val.ival;
-       case TYPE_oid: return (const void *) &v->val.oval;
-       case TYPE_wrd: return (const void *) &v->val.wval;
-       case TYPE_ptr: return (const void *) v->val.pval;
        case TYPE_flt: return (const void *) &v->val.fval;
        case TYPE_dbl: return (const void *) &v->val.dval;
        case TYPE_lng: return (const void *) &v->val.lval;
diff --git a/gdk/gdk_value.c b/gdk/gdk_value.c
--- a/gdk/gdk_value.c
+++ b/gdk/gdk_value.c
@@ -96,24 +96,16 @@ void *
 VALget(ValPtr v)
 {
        switch (ATOMstorage(v->vtype)) {
-       case TYPE_void:
-               return (void *) &v->val.oval;
-       case TYPE_bte:
-               return (void *) &v->val.btval;
-       case TYPE_sht:
-               return (void *) &v->val.shval;
-       case TYPE_int:
-               return (void *) &v->val.ival;
-       case TYPE_flt:
-               return (void *) &v->val.fval;
-       case TYPE_dbl:
-               return (void *) &v->val.dval;
-       case TYPE_lng:
-               return (void *) &v->val.lval;
-       case TYPE_str:
-               return (void *) v->val.sval;
+       case TYPE_void: return (void *) &v->val.oval;
+       case TYPE_bte: return (void *) &v->val.btval;
+       case TYPE_sht: return (void *) &v->val.shval;
+       case TYPE_int: return (void *) &v->val.ival;
+       case TYPE_flt: return (void *) &v->val.fval;
+       case TYPE_dbl: return (void *) &v->val.dval;
+       case TYPE_lng: return (void *) &v->val.lval;
+       case TYPE_str: return (void *) v->val.sval;
+       default:       return (void *) v->val.pval;
        }
-       return NULL;
 }
 
 void
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list