Merge pull request #1497 from joto/fix-sign-conversions

Fix some implicit signed-unsigned conversions

Author: lonvia

src/db-copy-mgr.hpp

@@ -250,9 +250,10 @@ class db_copy_mgr_t
     {
         char const *const lookup_hex = "0123456789ABCDEF";
 
-        for (char c : wkb) {
-            m_current->buffer += lookup_hex[(c >> 4U) & 0xfU];
-            m_current->buffer += lookup_hex[c & 0xfU];
+        for (auto c : wkb) {
+            auto const num = static_cast<unsigned int>(c);
+            m_current->buffer += lookup_hex[(num >> 4U) & 0xfU];
+            m_current->buffer += lookup_hex[num & 0xfU];
         }
         m_current->buffer += '\t';
     }

src/middle-pgsql.cpp

@@ -458,7 +458,7 @@ middle_query_pgsql_t::rel_members_get(osmium::Relation const &rel,
             continue;
         }
         for (int j = 0; j < res.num_tuples(); ++j) {
-            if (m.ref() == wayidspg[j]) {
+            if (m.ref() == wayidspg[static_cast<std::size_t>(j)]) {
                 {
                     osmium::builder::WayBuilder builder{*buffer};
                     builder.set_id(m.ref());

src/middle-ram.cpp

@@ -152,7 +152,7 @@ void middle_ram_t::node(osmium::Node const &node)
     assert(node.visible());
 
     if (m_store_options.locations) {
-        m_node_locations.set(node.positive_id(), node.location());
+        m_node_locations.set(node.id(), node.location());
     }
 
     if (m_store_options.nodes &&
@@ -193,7 +193,7 @@ std::size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const
 
     if (m_store_options.locations) {
         for (auto &nr : *nodes) {
-            nr.set_location(m_node_locations.get(nr.positive_ref()));
+            nr.set_location(m_node_locations.get(nr.ref()));
             if (nr.location().valid()) {
                 ++count;
             }

src/progress-display.cpp

@@ -88,27 +88,29 @@ uint64_t progress_display_t::nodes_time(std::time_t now) const noexcept
     if (m_node.count == 0) {
         return 0;
     }
-    return (m_way.start > 0 ? m_way.start : now) - m_node.start;
+    return static_cast<uint64_t>((m_way.start > 0 ? m_way.start : now) -
+                                 m_node.start);
 }
 
 uint64_t progress_display_t::ways_time(std::time_t now) const noexcept
 {
     if (m_way.count == 0) {
         return 0;
     }
-    return (m_rel.start > 0 ? m_rel.start : now) - m_way.start;
+    return static_cast<uint64_t>((m_rel.start > 0 ? m_rel.start : now) -
+                                 m_way.start);
 }
 
 uint64_t progress_display_t::rels_time(std::time_t now) const noexcept
 {
     if (m_rel.count == 0) {
         return 0;
     }
-    return now - m_rel.start;
+    return static_cast<uint64_t>(now - m_rel.start);
 }
 
 uint64_t progress_display_t::overall_time(std::time_t now) const noexcept
 {
-    return now - m_node.start;
+    return static_cast<uint64_t>(now - m_node.start);
 }
 

src/tagtransform-c.cpp

@@ -100,7 +100,8 @@ std::unique_ptr<tagtransform_t> c_tagtransform_t::clone() const
 }
 
 bool c_tagtransform_t::check_key(std::vector<taginfo> const &infos,
-                                 char const *k, bool *filter, int *flags)
+                                 char const *k, bool *filter,
+                                 unsigned int *flags)
 {
     //go through the actual tags found on the item and keep the ones in the export list
     for (auto const &info : infos) {
@@ -150,7 +151,7 @@ bool c_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
     //assume we dont like this set of tags
     bool filter = true;
 
-    int flags = 0;
+    unsigned int flags = 0;
     int add_area_tag = 0;
 
     auto export_type = o.type();

src/tagtransform-c.hpp

@@ -31,7 +31,7 @@ class c_tagtransform_t : public tagtransform_t
 
 private:
     bool check_key(std::vector<taginfo> const &infos, char const *k,
-                   bool *filter, int *flags);
+                   bool *filter, unsigned int *flags);
 
     options_t const *m_options;
     export_list m_export_list;

src/util.cpp

@@ -40,8 +40,8 @@ std::string human_readable_duration(uint64_t seconds)
 
 std::string human_readable_duration(std::chrono::milliseconds ms)
 {
-    return human_readable_duration(
-        std::chrono::duration_cast<std::chrono::seconds>(ms).count());
+    return human_readable_duration(static_cast<uint64_t>(
+        std::chrono::duration_cast<std::chrono::seconds>(ms).count()));
 }
 
 } // namespace util

src/util.hpp

@@ -93,11 +93,14 @@ class timer_t
     uint64_t stop() noexcept
     {
         m_stop = std::time(nullptr);
-        return m_stop - m_start;
+        return static_cast<uint64_t>(m_stop - m_start);
     }
 
     /// Return elapsed time
-    uint64_t elapsed() const noexcept { return m_stop - m_start; }
+    uint64_t elapsed() const noexcept
+    {
+        return static_cast<uint64_t>(m_stop - m_start);
+    }
 
     /**
      * Calculate ratio: value divided by elapsed time.