Changeset 15100 for issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp

Timestamp:

05/24/13 13:02:48 (12 years ago)

Author:

Eric.Larour

Message:

CHG: changed the names of _printString_ and _pprintString_
to _printf_ and _printf0_

File:

• issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp (modified) (19 diffs)

issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp

@@ -133 +133 @@
 
 //      if      (itag)
-//              _pprintString_("tag buffer (length=" << ibuf << "):" << "\n");
+//              _printf0_("tag buffer (length=" << ibuf << "):" << "\n");
 //      else if (ifield)
-//              _pprintString_("field buffer (length=" << ibuf << "):" << "\n");
-//      _pprintString_(buffer << "\n");
+//              _printf0_("field buffer (length=" << ibuf << "):" << "\n");
+//      _printf0_(buffer << "\n");
 
         if (!ibuf)
@@ -199 +199 @@
                 }
 
-//      _pprintString_("comment buffer (length=" << ibuf << "):" << "\n");
-//      _pprintString_(buffer << "\n");
+//      _printf0_("comment buffer (length=" << ibuf << "):" << "\n");
+//      _printf0_(buffer << "\n");
 
         if (!ibuf)
@@ -265 +265 @@
 
         ktokn=strtok(ktagi,"< >");
-//      _pprintString_("KMLFileTagName -- initial token=\"" << ktokn << "\"." << "\n");
+//      _printf0_("KMLFileTagName -- initial token=\"" << ktokn << "\"." << "\n");
 
         if (!pname) {
@@ -275 +275 @@
 
         if (maxlen && (maxlen < strlen(ktokn))) {
-                _pprintString_("KMLFileTagName -- string field too short for " << ktag << "." << "\n");
-                _pprintString_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters." << "\n");
+                _printf0_("KMLFileTagName -- string field too short for " << ktag << "." << "\n");
+                _printf0_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters." << "\n");
                 strncpy(pname,ktokn,maxlen);
         }
@@ -311 +311 @@
         /*  return first non blank and move past subsequent blank  */
         ktokn=strtok(ktagi," ");
-//      _pprintString_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\"." << "\n");
+//      _printf0_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\"." << "\n");
 
         /*  return next non " =?/>" and move past subsequent " =?/>"  */
@@ -318 +318 @@
                 /*  return next non quote and move past subsequent quote  */
                 ktokv=strtok(NULL,quote);
-//              _pprintString_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\"." << "\n");
+//              _printf0_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\"." << "\n");
 
 /*  add the attribute to the dataset  */
@@ -334 +334 @@
                 (!strncmp(&ktag[0],"<"        ,1) && !strncmp(&ktag[strlen(ktag)-2],"/>",2)))
                 isolo=1;
-//      _pprintString_("KMLFileTagAttrib -- isolo=" << isolo << "." << "\n");
+//      _printf0_("KMLFileTagAttrib -- isolo=" << isolo << "." << "\n");
 
         return(isolo);
@@ -368 +368 @@
                         xDelete<char>(kstr);
 
-//      _pprintString_("KMLFileTokenParse -- " << ktag << "=" << *pival << "." << "\n");
+//      _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pival << "." << "\n");
 
         return(0);
@@ -402 +402 @@
                         xDelete<char>(kstr);
 
-//      _pprintString_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << "." << "\n");
+//      _printf0_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << "." << "\n");
 
         return(0);
@@ -439 +439 @@
 
         if (maxlen && (maxlen < strlen(kstr))) {
-                _pprintString_("KMLFileTokenParse -- string field too short for " << ktag << "." << "\n");
-                _pprintString_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters." << "\n");
+                _printf0_("KMLFileTokenParse -- string field too short for " << ktag << "." << "\n");
+                _printf0_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters." << "\n");
                 strncpy(pstr,kstr,maxlen);
         }
@@ -463 +463 @@
                         xDelete<char>(kstr);
 
-//      _pprintString_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\"." << "\n");
+//      _printf0_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\"." << "\n");
 
         return(pstr);
@@ -497 +497 @@
                         xDelete<char>(kstr);
 
-//      _pprintString_("KMLFileTokenParse -- " << ktag << "=" << *pfval << "." << "\n");
+//      _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pfval << "." << "\n");
 
         return(0);
@@ -531 +531 @@
                         xDelete<char>(kstr);
 
-//      _pprintString_("KMLFileTokenParse -- " << ktag << "=" << *pdval << "." << "\n");
+//      _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pdval << "." << "\n");
 
         return(0);
@@ -595 +595 @@
                         xDelete<char>(kstr);
 
-//      _pprintString_("KMLFileTokenParse -- " << ktag << "=..." << "\n");
+//      _printf0_("KMLFileTokenParse -- " << ktag << "=..." << "\n");
 //      for (j=0; j<=i; j++)
-//              _pprintString_("   [" << j << "]: " << (*pdval)[j] << "g" << "\n");
+//              _printf0_("   [" << j << "]: " << (*pdval)[j] << "g" << "\n");
 
         return(0);
@@ -651 +651 @@
 
         if ((i+1) % n)
-                _pprintString_("KMLFileTokenParse -- Double [m x n] field for " << ktag << " does not have multiple of n values." << "\n");
+                _printf0_("KMLFileTokenParse -- Double [m x n] field for " << ktag << " does not have multiple of n values." << "\n");
 
 /*  get additional token and compare to closing tag  */
@@ -665 +665 @@
                         xDelete<char>(kstr);
 
-//      _pprintString_("KMLFileTokenParse -- " << ktag << "=..." << "\n");
+//      _printf0_("KMLFileTokenParse -- " << ktag << "=..." << "\n");
 //      for (j=0; j<=i; j++)
-//              _pprintString_("   [" << j << "]: " << (*pdval)[j] << "g" << "\n");
+//              _printf0_("   [" << j << "]: " << (*pdval)[j] << "g" << "\n");
 
         return(0);
@@ -681 +681 @@
         opening tag, must find corresponding closing tag  */
 
-        _pprintString_("KMLFileTagSkip -- input tag " << ktag << "." << "\n");
+        _printf0_("KMLFileTagSkip -- input tag " << ktag << "." << "\n");
 
 /*  if next token is a closing tag, compare to input  */
@@ -690 +690 @@
                                  (kstr[1] == '/') &&
                                  (!strncmp(&(kstr[2]),&(ktag[1]),(strcspn(ktag," >")-1)/sizeof(char)))) {
-                        _pprintString_("KMLFileTagSkip -- closing tag " << kstr << "." << "\n");
+                        _printf0_("KMLFileTagSkip -- closing tag " << kstr << "." << "\n");
                         xDelete<char>(kstr);
                         return(0);
@@ -699 +699 @@
                 else if ((kstr[0] == '<') &&
                                  (kstr[1] != '/')) {
-                        _pprintString_("KMLFileTagSkip -- opening tag " << kstr << "." << "\n");
+                        _printf0_("KMLFileTagSkip -- opening tag " << kstr << "." << "\n");
                         KMLFileTagSkip(kstr,
                                                    fid);