# HG changeset patch
# User Rik <rik@octave.org>
# Date 1631246458 25200
# Node ID e35887fa9ead3392557bfe331a89d7863289d693
# Parent  f6fe2dcaffaff0399b16a844eb97268ea8a67e86
maint: use "m_" prefix for member variables in class url_handle_manager.

* url-handle-manager.cc, url-handle-manager.h: Use "m_" prefix for member
variables in class url_handle_manager.

diff -r f6fe2dcaffaf -r e35887fa9ead libinterp/corefcn/url-handle-manager.cc
--- a/libinterp/corefcn/url-handle-manager.cc	Thu Sep 09 20:51:08 2021 -0700
+++ b/libinterp/corefcn/url-handle-manager.cc	Thu Sep 09 21:00:58 2021 -0700
@@ -51,18 +51,18 @@
     // part.  To avoid running out of integers, we recycle the integer
     // part but tack on a new random part each time.
 
-    auto p = handle_free_list.begin ();
+    auto p = m_handle_free_list.begin ();
 
-    if (p != handle_free_list.end ())
+    if (p != m_handle_free_list.end ())
       {
         retval = *p;
-        handle_free_list.erase (p);
+        m_handle_free_list.erase (p);
       }
     else
       {
-        retval = url_handle (next_handle);
+        retval = url_handle (m_next_handle);
 
-        next_handle = std::ceil (next_handle) - 1.0 - make_handle_fraction ();
+        m_next_handle = std::ceil (m_next_handle) - 1.0 - make_handle_fraction ();
       }
 
     return retval;
@@ -72,9 +72,9 @@
   {
     if (h.ok ())
       {
-        auto p = handle_map.find (h);
+        auto p = m_handle_map.find (h);
 
-        if (p == handle_map.end ())
+        if (p == m_handle_map.end ())
           error ("url_handle_manager::free: invalid object %g", h.value ());
 
         // Curl handles are negative integers plus some random
@@ -82,10 +82,10 @@
         // recycle the integer part but tack on a new random part
         // each time.
 
-        handle_map.erase (p);
+        m_handle_map.erase (p);
 
         if (h.value () < 0)
-          handle_free_list.insert
+          m_handle_free_list.insert
             (std::ceil (h.value ()) - make_handle_fraction ());
       }
   }
diff -r f6fe2dcaffaf -r e35887fa9ead libinterp/corefcn/url-handle-manager.h
--- a/libinterp/corefcn/url-handle-manager.h	Thu Sep 09 20:51:08 2021 -0700
+++ b/libinterp/corefcn/url-handle-manager.h	Thu Sep 09 21:00:58 2021 -0700
@@ -49,8 +49,8 @@
   public:
 
     url_handle_manager (void)
-      : handle_map (), handle_free_list (),
-        next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)) { }
+      : m_handle_map (), m_handle_free_list (),
+        m_next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)) { }
 
     url_handle_manager (const url_handle_manager&) = delete;
 
@@ -64,10 +64,10 @@
 
     url_handle lookup (double val)
     {
-      iterator p = (math::isnan (val) ? handle_map.end ()
-                                      : handle_map.find (val));
+      iterator p = (math::isnan (val) ? m_handle_map.end ()
+                                      : m_handle_map.find (val));
 
-      return (p != handle_map.end ()) ? p->first : url_handle ();
+      return (p != m_handle_map.end ()) ? p->first : url_handle ();
     }
 
     url_handle lookup (const octave_value& val)
@@ -88,9 +88,9 @@
 
     url_transfer get_object (const url_handle& h)
     {
-      iterator p = (h.ok () ? handle_map.find (h) : handle_map.end ());
+      iterator p = (h.ok () ? m_handle_map.find (h) : m_handle_map.end ());
 
-      return (p != handle_map.end ()) ? p->second : url_transfer ();
+      return (p != m_handle_map.end ()) ? p->second : url_transfer ();
     }
 
     url_handle make_url_handle (const std::string& host,
@@ -105,17 +105,17 @@
       if (! obj.is_valid ())
         error ("support for URL transfers was disabled when Octave was built");
 
-      handle_map[h] = obj;
+      m_handle_map[h] = obj;
 
       return h;
     }
 
     Matrix handle_list (void)
     {
-      Matrix retval (1, handle_map.size ());
+      Matrix retval (1, m_handle_map.size ());
 
       octave_idx_type i = 0;
-      for (const auto& h_obj : handle_map)
+      for (const auto& h_obj : m_handle_map)
         {
           url_handle h = h_obj.first;
 
@@ -135,13 +135,13 @@
     typedef std::set<url_handle>::const_iterator const_free_list_iterator;
 
     // A map of handles to curl objects.
-    std::map<url_handle, url_transfer> handle_map;
+    std::map<url_handle, url_transfer> m_handle_map;
 
     // The available curl handles.
-    std::set<url_handle> handle_free_list;
+    std::set<url_handle> m_handle_free_list;
 
     // The next handle available if handle_free_list is empty.
-    double next_handle;
+    double m_next_handle;
   };
 }