avoid shadowing warning

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

include/exiv2/quicktimevideo.hpp

@@ -139,7 +139,7 @@ class EXIV2API QuickTimeVideo : public Image {
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-  void userDataDecoder(size_t size, size_t recursion_depth);
+  void userDataDecoder(size_t outer_size, size_t recursion_depth);
   /*!
     @brief Interpret Preview Tag, and save it
         in the respective XMP container.

src/http.cpp

@@ -199,17 +199,17 @@ int Exiv2::http(Exiv2::Dictionary& request, Exiv2::Dictionary& response, std::st
     struct addrinfo hints = {};
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_STREAM;
-    struct addrinfo* result;
+    struct addrinfo* r;
 
-    int res = getaddrinfo(servername_p, port_p, &hints, &result);
+    int res = getaddrinfo(servername_p, port_p, &hints, &r);
     if (res != 0) {
       closesocket(sockfd);
       return error(errors, "no such host: %s", gai_strerror(res));
     }
 
-    std::memcpy(&serv_addr, result->ai_addr, serv_len);
+    std::memcpy(&serv_addr, r->ai_addr, serv_len);
 
-    freeaddrinfo(result);
+    freeaddrinfo(r);
   }
 
   makeNonBlocking(sockfd);

src/quicktimevideo.cpp

@@ -842,7 +842,7 @@ void QuickTimeVideo::CameraTagsDecoder(size_t size) {
   io_->seek(cur_pos + size, BasicIo::beg);
 }  // QuickTimeVideo::CameraTagsDecoder
 
-void QuickTimeVideo::userDataDecoder(size_t size, size_t recursion_depth) {
+void QuickTimeVideo::userDataDecoder(size_t outer_size, size_t recursion_depth) {
   enforce(recursion_depth < max_recursion_depth_, Exiv2::ErrorCode::kerCorruptedMetadata);
   size_t cur_pos = io_->tell();
   const TagVocabulary* td;
@@ -851,7 +851,7 @@ void QuickTimeVideo::userDataDecoder(size_t size, size_t recursion_depth) {
 
   const long bufMinSize = 100;
   DataBuf buf(bufMinSize);
-  size_t size_internal = size;
+  size_t size_internal = outer_size;
   std::memset(buf.data(), 0x0, buf.size());
 
   while ((size_internal / 4 != 0) && (size_internal > 0)) {
@@ -908,7 +908,7 @@ void QuickTimeVideo::userDataDecoder(size_t size, size_t recursion_depth) {
       tagDecoder(buf, size - 8, recursion_depth + 1);
   }
 
-  io_->seek(cur_pos + size, BasicIo::beg);
+  io_->seek(cur_pos + outer_size, BasicIo::beg);
 }  // QuickTimeVideo::userDataDecoder
 
 void QuickTimeVideo::NikonTagsDecoder(size_t size) {