optimize istringstream slightly

Signed-off-by: Rosen Penev <[email protected]>
Exiv2 · Feb 15, 2025 · 774912e · 774912e
1 parent c089ad8
commit 774912e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/include/exiv2/value.hpp b/include/exiv2/value.hpp
@@ -1511,14 +1511,12 @@ int ValueType<T>::read(const byte* buf, size_t len, ByteOrder byteOrder) {
 template <typename T>
 int ValueType<T>::read(const std::string& buf) {
   std::istringstream is(buf);
-  T tmp = T();
+  T tmp;
   ValueList val;
-  while (!(is.eof())) {
-    is >> tmp;
-    if (is.fail())
-      return 1;
+  while (is >> tmp)
     val.push_back(tmp);
-  }
+  if (is.fail() && !is.eof())
+    return 1;
   value_.swap(val);
   return 0;
 }

diff --git a/src/value.cpp b/src/value.cpp
@@ -111,12 +111,10 @@ int DataValue::read(const std::string& buf) {
   std::istringstream is(buf);
   int tmp = 0;
   ValueType val;
-  while (!(is.eof())) {
-    is >> tmp;
-    if (is.fail())
-      return 1;
+  while (is >> tmp)
     val.push_back(static_cast<byte>(tmp));
-  }
+  if (is.fail() && !is.eof())
+    return 1;
   value_.swap(val);
   return 0;
 }