MonetDB: default - make sure we always initialize variables imin...

[Stefan Manegold]

Changeset: 09fa2b9ce1c5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=09fa2b9ce1c5
Modified Files:
        sql/src/backends/monet5/vaults/mseed.mx
Branch: default
Log Message:

make sure we always initialize variables imin and imax before we use them

and simplify the respective code a bit

this also fixes compilation with optimization enabled
by preventing
"
sql/src/backends/monet5/vaults/mseed.mx: In function ‘MseedInternal’:
sql/src/backends/monet5/vaults/mseed.mx:205: error: ‘imin’ may be used 
uninitialized in this function
sql/src/backends/monet5/vaults/mseed.mx:205: error: ‘imax’ may be used 
uninitialized in this function
"


diffs (32 lines):

diff -r 4a2790dbc194 -r 09fa2b9ce1c5 sql/src/backends/monet5/vaults/mseed.mx
--- a/sql/src/backends/monet5/vaults/mseed.mx   Sat Dec 25 13:30:04 2010 +0100
+++ b/sql/src/backends/monet5/vaults/mseed.mx   Sat Dec 25 13:33:31 2010 +0100
@@ -202,7 +202,7 @@
        char starttime[BUFSIZ];
        char stoptime[BUFSIZ];
        int stepsize;
-       int imin,imax;
+       int imin = INT_MAX, imax = INT_MIN;
        int nobat=0;
        FILE *data=0, *time=0;
 
@@ -247,7 +247,7 @@
 
                switch(msr->sampletype){
                        case 'a': kind="'string'"; break;
-                       case 'i': kind="'int'"; imin= int_nil; imax= int_nil; 
break;
+                       case 'i': kind="'int'"; imin = INT_MAX; imax = INT_MIN; 
break;
                        case 'f': kind="'flt'"; break;
                        case 'd': kind="'dbl'"; break;
                        default : kind="null";
@@ -296,8 +296,8 @@
                                        fwrite((char*) &tm, sizeof(timestamp), 
1, time);
                                        fwrite( (char*) &((int*) 
msr->datasamples)[j], sizeof(int), 1, data);
                                }
-                               if ( imin == int_nil || imin > ((int*) 
msr->datasamples)[j]) imin = ((int*) msr->datasamples)[j];
-                               if ( imax == int_nil || imax < ((int*) 
msr->datasamples)[j]) imax = ((int*) msr->datasamples)[j];
+                               if ( imin > ((int*) msr->datasamples)[j]) imin 
= ((int*) msr->datasamples)[j];
+                               if ( imax < ((int*) msr->datasamples)[j]) imax 
= ((int*) msr->datasamples)[j];
                                break;
                        case 'f':
                                if ( load && (INSERTLOAD || MANUALLOAD ))
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list