source: issm/oecreview/Archive/14312-15392/ISSM-14550-14551.diff@ 15393

../trunk-jpl/src/c/shared/Exp/exp.h

@@ -90 +90 @@
         /*Do a first pass through the domainname file, to figure out how many profiles we need to read: */
         nprof=1;
         for(;;){
-                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
-                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
-                fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy);
-                fscanf(fid,"%20u %255s\n",&n,chardummy);
-                fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
-                for (i=0;i<n;i++) fscanf(fid,"%20lf %20lf\n",&ddummy,&ddummy);
+                //## Name:filename
+                if(fscanf(fid,"%255s %255s\n",chardummy,chardummy)!=2) _error_("Could not read " << domainname);
+                //## Icon:0
+                if(fscanf(fid,"%255s %255s\n",chardummy,chardummy)!=2) _error_("Could not read " << domainname);
+                //# Points Count Value
+                if(fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy)!=4) _error_("Could not read " << domainname);
+                if(fscanf(fid,"%20u %255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<<domainname);
+                //# X pos Y pos
+                if(fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy)!=5) _error_("Could not read " << domainname);
+                for (i=0;i<n;i++){
+                        if(fscanf(fid,"%20lf %20lf\n",&ddummy,&ddummy)!=2){
+                                _error_("Could not read coordinate of vertex "<< i <<" of "<<domainname);
+                        }
+                }
                 /*check whether we are at the end of the file, otherwise, keep reading next profile:*/
-                if (feof(fid)) break;
+                if(feof(fid)) break;
                 nprof++;
         }
 
@@ -118 +126 @@
         for(counter=0;counter<nprof;counter++){
 
                 /*Skip header: */
-                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
-                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
-                fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy);
+                //## Name:filename
+                if(fscanf(fid,"%255s %255s\n",chardummy,chardummy)!=2) _error_("Could not read " << domainname);
+                //## Icon:0
+                if(fscanf(fid,"%255s %255s\n",chardummy,chardummy)!=2) _error_("Could not read " << domainname);
+                //# Points Count Value
+                if(fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy)!=4) _error_("Could not read " << domainname);
 
                 /*Get number of profile vertices: */
-                fscanf(fid,"%20u %255s\n",&n,chardummy);
+                if(fscanf(fid,"%20u %255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<<domainname);
 
                 /*Skip next line: */
-                fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
+                //# X pos Y pos
+                if(fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy)!=5) _error_("Could not read " << domainname);
 
                 /*Allocate vertices: */
                 x=xNew<doubletype>(n);
@@ -134 +146 @@
 
                 /*Read vertices: */
                 for (i=0;i<n;i++){
-                        fscanf(fid,"%20lf %20lf\n",&x[i],&y[i]);
+                        if(fscanf(fid,"%20lf %20lf\n",&x[i],&y[i])!=2){
+                                _error_("Could not read coordinate of vertex "<<i<<" of "<<domainname);
+                        }
                 }
 
                 /*Now check that we are dealing with open contours: */