Changeset 12519 for issm/trunk-jpl/src/c/objects/KML

Timestamp:

06/22/12 17:27:12 (13 years ago)

Author:

Mathieu Morlighem

Message:

cosmetics

Location:

issm/trunk-jpl/src/c/objects/KML

Files:

• KMLFileReadUtils.cpp (modified) (19 diffs)
• KML_Object.cpp (modified) (1 diff)
• KML_Unknown.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp

@@ -127 +127 @@
 
 //      if      (itag)
-//              if(true) _pprintLine_("tag buffer (length=" << ibuf << "):");
+//              _pprintLine_("tag buffer (length=" << ibuf << "):");
 //      else if (ifield)
-//              if(true) _pprintLine_("field buffer (length=" << ibuf << "):");
-//      if(true) _pprintLine_("" << buffer);
+//              _pprintLine_("field buffer (length=" << ibuf << "):");
+//      _pprintLine_("" << buffer);
 
         if (!ibuf)
@@ -193 +193 @@
                 }
 
-//      if(true) _pprintLine_("comment buffer (length=" << ibuf << "):");
-//      if(true) _pprintLine_("" << buffer);
+//      _pprintLine_("comment buffer (length=" << ibuf << "):");
+//      _pprintLine_("" << buffer);
 
         if (!ibuf)
@@ -254 +254 @@
 
         ktokn=strtok(ktagi,"< >");
-//      if(true) _pprintLine_("KMLFileTagName -- initial token=\"" << ktokn << "\".");
+//      _pprintLine_("KMLFileTagName -- initial token=\"" << ktokn << "\".");
 
         if (!pname) {
@@ -264 +264 @@
 
         if (maxlen && (maxlen < strlen(ktokn))) {
-                if(true) _pprintLine_("KMLFileTagName -- string field too short for " << ktag << ".");
-                if(true) _pprintLine_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters.");
+                _pprintLine_("KMLFileTagName -- string field too short for " << ktag << ".");
+                _pprintLine_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters.");
                 strncpy(pname,ktokn,maxlen);
         }
@@ -300 +300 @@
         /*  return first non blank and move past subsequent blank  */
         ktokn=strtok(ktagi," ");
-//      if(true) _pprintLine_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\".");
+//      _pprintLine_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\".");
 
         /*  return next non " =?/>" and move past subsequent " =?/>"  */
@@ -307 +307 @@
                 /*  return next non quote and move past subsequent quote  */
                 ktokv=strtok(NULL,quote);
-//              if(true) _pprintLine_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\".");
+//              _pprintLine_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\".");
 
 /*  add the attribute to the dataset  */
@@ -323 +323 @@
                 (!strncmp(&ktag[0],"<"        ,1) && !strncmp(&ktag[strlen(ktag)-2],"/>",2)))
                 isolo=1;
-//      if(true) _pprintLine_("KMLFileTagAttrib -- isolo=" << isolo << ".");
+//      _pprintLine_("KMLFileTagAttrib -- isolo=" << isolo << ".");
 
         return(isolo);
@@ -357 +357 @@
                         xfree((void**)&kstr);
 
-//      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pival << ".");
+//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pival << ".");
 
         return(0);
@@ -391 +391 @@
                         xfree((void**)&kstr);
 
-//      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << ".");
+//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << ".");
 
         return(0);
@@ -428 +428 @@
 
         if (maxlen && (maxlen < strlen(kstr))) {
-                if(true) _pprintLine_("KMLFileTokenParse -- string field too short for " << ktag << ".");
-                if(true) _pprintLine_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters.");
+                _pprintLine_("KMLFileTokenParse -- string field too short for " << ktag << ".");
+                _pprintLine_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters.");
                 strncpy(pstr,kstr,maxlen);
         }
@@ -452 +452 @@
                         xfree((void**)&kstr);
 
-//      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\".");
+//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\".");
 
         return(pstr);
@@ -486 +486 @@
                         xfree((void**)&kstr);
 
-//      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pfval << ".");
+//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pfval << ".");
 
         return(0);
@@ -520 +520 @@
                         xfree((void**)&kstr);
 
-//      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pdval << ".");
+//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pdval << ".");
 
         return(0);
@@ -578 +578 @@
                         xfree((void**)&kstr);
 
-//      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
+//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
 //      for (j=0; j<=i; j++)
-//              if(true) _pprintLine_("   [" << j << "]: " << (*pdval)[j] << "g");
+//              _pprintLine_("   [" << j << "]: " << (*pdval)[j] << "g");
 
         return(0);
@@ -631 +631 @@
 
         if (j != 2)
-                if(true) _pprintLine_("KMLFileTokenParse -- Double [m x 3] field for " << ktag << " does not have multiple of 3 values.");
+                _pprintLine_("KMLFileTokenParse -- Double [m x 3] field for " << ktag << " does not have multiple of 3 values.");
 
 /*  get additional token and compare to closing tag  */
@@ -645 +645 @@
                         xfree((void**)&kstr);
 
-//      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
+//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
 //      for (j=0; j<=i; j++)
-//              if(true) _pprintLine_("   [" << j << "][0-2]: " << (*pdval3)[j][0] << "g," << (*pdval3)[j][1] << "g," << (*pdval3)[j][2] << "g");
+//              _pprintLine_("   [" << j << "][0-2]: " << (*pdval3)[j][0] << "g," << (*pdval3)[j][1] << "g," << (*pdval3)[j][2] << "g");
 
         return(0);
@@ -661 +661 @@
         opening tag, must find corresponding closing tag  */
 
-        if(true) _pprintLine_("KMLFileTagSkip -- input tag " << ktag << ".");
+        _pprintLine_("KMLFileTagSkip -- input tag " << ktag << ".");
 
 /*  if next token is a closing tag, compare to input  */
@@ -670 +670 @@
                                  (kstr[1] == '/') &&
                                  (!strncmp(&(kstr[2]),&(ktag[1]),(strcspn(ktag," >")-1)/sizeof(char)))) {
-                        if(true) _pprintLine_("KMLFileTagSkip -- closing tag " << kstr << ".");
+                        _pprintLine_("KMLFileTagSkip -- closing tag " << kstr << ".");
                         xfree((void**)&kstr);
                         return(0);
@@ -679 +679 @@
                 else if ((kstr[0] == '<') &&
                                  (kstr[1] != '/')) {
-                        if(true) _pprintLine_("KMLFileTagSkip -- opening tag " << kstr << ".");
+                        _pprintLine_("KMLFileTagSkip -- opening tag " << kstr << ".");
                         KMLFileTagSkip(kstr,
                                                    fid);

issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp

@@ -253 +253 @@
 
         else if (!strncmp(kstr,"<",1)) {
-                if(true) _pprintLine_("KML_Object::Read -- Unrecognized opening tag " << kstr << ".");
+                _pprintLine_("KML_Object::Read -- Unrecognized opening tag " << kstr << ".");
 //              KMLFileTagSkip(kstr,
 //                                         fid);

issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp

@@ -139 +139 @@
         name=KMLFileTagName(NULL,
                                                 kstr);
-//      if(true) _pprintLine_("KML_Unknown::Read -- opening name=" << name << ".");
+//      _pprintLine_("KML_Unknown::Read -- opening name=" << name << ".");
 
 /*  get object attributes and check for solo tag  */
@@ -151 +151 @@
         while (kstri=KMLFileToken(fid,
                                                           &ncom,&pcom)) {
-//              if(true) _pprintLine_("KML_Unknown::Read -- kstri=" << kstri << ".");
+//              _pprintLine_("KML_Unknown::Read -- kstri=" << kstri << ".");
                 if      (!strncmp(&kstri[0],"</", 2) &&
                                  !strncmp(&kstri[2],name,strlen(name))) {
-//                      if(true) _pprintLine_("KML_Unknown::Read -- closing name=" << name << ".");
+//                      _pprintLine_("KML_Unknown::Read -- closing name=" << name << ".");
                         xfree((void**)&kstri);
                         break;