From 576d53e34fdc76edfb18cc19a16af946823d8bc9 Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Tue, 13 May 2008 09:28:28 +0000 Subject: [PATCH] Fixed compiler warnings (amd64) --- xmpsdk/src/XMPIterator.cpp | 2 +- xmpsdk/src/XMPMeta.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xmpsdk/src/XMPIterator.cpp b/xmpsdk/src/XMPIterator.cpp index 034c0792..3054af42 100644 --- a/xmpsdk/src/XMPIterator.cpp +++ b/xmpsdk/src/XMPIterator.cpp @@ -156,7 +156,7 @@ AddNodeOffspring ( IterInfo & info, IterNode & iterParent, const XMP_Node * xmpP currPath += xmpChild->name; } else { char buffer [32]; // AUDIT: Using sizeof(buffer) below for snprintf length is safe. - snprintf ( buffer, sizeof(buffer), "[%u]", childNum+1 ); // ! XPath indices are one-based. + snprintf ( buffer, sizeof(buffer), "[%lu]", static_cast(childNum+1) ); // ! XPath indices are one-based. currPath += buffer; } iterParent.children.push_back ( IterNode ( xmpChild->options, currPath, leafOffset ) ); diff --git a/xmpsdk/src/XMPMeta.cpp b/xmpsdk/src/XMPMeta.cpp index 5efd091a..f9c3f6a2 100644 --- a/xmpsdk/src/XMPMeta.cpp +++ b/xmpsdk/src/XMPMeta.cpp @@ -76,7 +76,7 @@ static const char * kTenSpaces = " "; #define OutProcString(str) { status = (*outProc) ( refCon, (str).c_str(), (str).size() ); if ( status != 0 ) goto EXIT; } -#define OutProcDecInt(num) { snprintf ( buffer, sizeof(buffer), "%d", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \ +#define OutProcULong(num) { snprintf ( buffer, sizeof(buffer), "%lu", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \ status = (*outProc) ( refCon, buffer, strlen(buffer) ); if ( status != 0 ) goto EXIT; } #define OutProcHexInt(num) { snprintf ( buffer, sizeof(buffer), "%lX", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \ @@ -214,7 +214,7 @@ DumpPropertyTree ( const XMP_Node * currNode, OutProcString ( currNode->name ); } else { OutProcNChars ( "[", 1 ); - OutProcDecInt ( itemIndex ); + OutProcULong ( static_cast(itemIndex) ); OutProcNChars ( "]", 1 ); }