Changeset 1b5b24e in tol

Timestamp:

Jul 2, 2024, 9:31:04 AM (2 years ago)

Author:

pradeep <pradeep.bangera@…>

Branches:

devel

Parents:

fcad887

Message:

_LLD64_ hard coded to %lld

Location:

tol/OIS

Files:

• oisxml.cpp (modified) (4 diffs)
• tol_ois.h (modified) (1 diff)

tol/OIS/oisxml.cpp

@@ -214 +214 @@
         }
       }
-      header_->Print("<file_%d><path>%s</path><release>%s</release><size>%s</size></file_%d>\n",
-                    _LLD64_, 
+      header_->Print("<file_%d><path>%s</path><release>%s</release><size>%lld</size></file_%d>\n", 
                      n+1,
-                     path.String(), 
+                     path.String(),
                      dateFmt_.DateToText(fileTime).String(),
                      fileSize,
@@ -246 +245 @@
     if(allFiles_[n])
     {                           
-      header_->Print("<%s><size>%s</size><entries>%ld</entries></%s>\n",
-                    _LLD64_,
+      header_->Print("<%s><size>%lld</size><entries>%ld</entries></%s>\n",
                     allFiles_[n]->Title().String(), 
                     stat_.fileStat_[n].bytes_, 
@@ -554 +552 @@
     XMLEnsure(XMLGetNextTagValue(tag_, value_, "release")); tolSources_[n].release_ = dateFmt_.TextToDate(value_);
     XMLEnsure(XMLGetNextTagValue(tag_, value_, "size"   ));
-    sscanf(value_,_LLD64_,&tolSources_[n].bytes_  ); 
+    sscanf(value_,"%lld",&tolSources_[n].bytes_  ); 
     XMLEnsure(XMLEnsureEndTag   (fn.String()));
     
@@ -602 +600 @@
     XMLEnsure(XMLGetNextTagTitle(tag_, allFiles_[n]->Title().String()));
     XMLEnsure(XMLGetNextTagValue(tag_, value_, "size"   ));
-    sscanf(value_,_LLD64_, &stat_.fileStat_[n].bytes_  );
+    sscanf(value_,"%lld", &stat_.fileStat_[n].bytes_  );
     XMLEnsure(XMLGetNextTagValue(tag_, value_, "entries")); sscanf(value_,"%d",   &stat_.fileStat_[n].entries_);
     XMLEnsure(XMLEnsureEndTag   (allFiles_[n]->Title().String()));

tol/OIS/tol_ois.h

@@ -52 +52 @@
 
 #if defined( __MINGW32__ ) || ( defined(_MSC_VER) && (_MSC_VER<1400) )
-#define _LLD64_ "%I64d"
+#define _LLD64_ "I64d"
 #else
-#define _LLD64_ "%lld"
+#define _LLD64_ "lld"
 #endif