reapack

commit 48ecf7a65ac2dba64a0549945ab4c88f130e36b3
parent 0d90bceb39020ecf6d3bbd5f28903c29d1b52273
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Thu, 11 Aug 2016 01:38:55 -0400

refactoring – use printf placeholders in boost::format templates

They are prettier, shorter, and correctly highlighted in my vim setup.

Diffstat:
M
src/package.cpp
 | 
4
++--
M
src/version.cpp
 | 
6
+++---

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/package.cpp b/src/package.cpp
@@ -75,7 +75,7 @@ Package::Package(const Type type, const string &name, const Category *cat)
   if(m_name.empty())
     throw reapack_error("empty package name");
   else if(m_name.find_first_of("/\\") != string::npos)
-    throw reapack_error(format("invalid package name '%1%'") % m_name);
+    throw reapack_error(format("invalid package name '%s'") % m_name);
 }
 
 Package::~Package()
@@ -96,7 +96,7 @@ bool Package::addVersion(const Version *ver)
   else if(ver->sources().empty())
     return false;
   else if(m_versions.count(ver))
-    throw reapack_error(format("duplicate version '%1%'") % ver->fullName());
+    throw reapack_error(format("duplicate version '%s'") % ver->fullName());
 
   m_versions.insert(ver);
 
diff --git a/src/version.cpp b/src/version.cpp
@@ -68,7 +68,7 @@ void Version::parse(const string &str)
 
     if(first >= 'a' || first >= 'z') {
       if(segments.empty()) // got leading letters
-        throw reapack_error(format("invalid version name '%1%'") % str);
+        throw reapack_error(format("invalid version name '%s'") % str);
 
       segments.push_back(match);
       letters++;
@@ -78,13 +78,13 @@ void Version::parse(const string &str)
         segments.push_back(boost::lexical_cast<Numeric>(match));
       }
       catch(const boost::bad_lexical_cast &) {
-        throw reapack_error(format("version segment overflow in '%1%'") % str);
+        throw reapack_error(format("version segment overflow in '%s'") % str);
       }
     }
   }
 
   if(segments.empty()) // version doesn't have any numbers
-    throw reapack_error(format("invalid version name '%1%'") % str);
+    throw reapack_error(format("invalid version name '%s'") % str);
 
   m_name = str;
   swap(m_segments, segments);