* Rename Sbuild::Lock to sbuild::lock, Sbuild::FileLock to

  sbuild::file_lock, and Sbuild::DeviceLock to sbuild::device_lock.

8 files changed, 92 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index fc4fdaf8..f3375962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-05  Roger Leigh  <rleigh@debian.org>
 
+	* Rename Sbuild::Lock to sbuild::lock, Sbuild::FileLock to
+	sbuild::file_lock, and Sbuild::DeviceLock to sbuild::device_lock.
+
+2006-02-05  Roger Leigh  <rleigh@debian.org>
+
 	* Rename sbuild-config.(cc|h) to sbuild-chroot-config.(cc|h).
 
 	* Rename sbuild::Config to sbuild::chroot_config.
diff --git a/schroot/sbuild-chroot-block-device.cc b/schroot/sbuild-chroot-block-device.cc
index add5b592..3d7242aa 100644
--- a/schroot/sbuild-chroot-block-device.cc
+++ b/schroot/sbuild-chroot-block-device.cc
@@ -134,14 +134,14 @@ chroot_block_device::setup_lock (SetupType type,
     }
   else
     {
-      sbuild::DeviceLock dlock(this->device);
+      sbuild::device_lock dlock(this->device);
       if (lock)
 	{
 	  try
 	    {
-	      dlock.set_lock(Lock::LOCK_EXCLUSIVE, 15);
+	      dlock.set_lock(lock::LOCK_EXCLUSIVE, 15);
 	    }
-	  catch (sbuild::Lock::error const& e)
+	  catch (sbuild::lock::error const& e)
 	    {
 	      format fmt(_("%1%: failed to lock device: %2%"));
 	      fmt % get_device() % e.what();
@@ -154,7 +154,7 @@ chroot_block_device::setup_lock (SetupType type,
 	    {
 	      dlock.unset_lock();
 	    }
-	  catch (sbuild::Lock::error const& e)
+	  catch (sbuild::lock::error const& e)
 	    {
 	      format fmt(_("%1%: failed to unlock device: %2%"));
 	      fmt % get_device() % e.what();
diff --git a/schroot/sbuild-chroot-config.cc b/schroot/sbuild-chroot-config.cc
index 5d0bc424..b87622aa 100644
--- a/schroot/sbuild-chroot-config.cc
+++ b/schroot/sbuild-chroot-config.cc
@@ -287,12 +287,12 @@ chroot_config::load (std::string const& file,
       throw error(fmt);
     }
 
-  sbuild::FileLock lock(fd);
+  sbuild::file_lock lock(fd);
   try
     {
-      lock.set_lock(Lock::LOCK_SHARED, 2);
+      lock.set_lock(lock::LOCK_SHARED, 2);
     }
-  catch (Lock::error const& e)
+  catch (lock::error const& e)
     {
       format fmt(_("%1%: lock acquisition failure: %2%"));
       fmt % file % e.what();
@@ -322,7 +322,7 @@ chroot_config::load (std::string const& file,
     {
       lock.unset_lock();
     }
-  catch (Lock::error const& e)
+  catch (lock::error const& e)
     {
       format fmt(_("%1%: lock discard failure: %2%"));
       fmt % file % e.what();
diff --git a/schroot/sbuild-chroot-lvm-snapshot.cc b/schroot/sbuild-chroot-lvm-snapshot.cc
index 0cfaaed0..0f25ded7 100644
--- a/schroot/sbuild-chroot-lvm-snapshot.cc
+++ b/schroot/sbuild-chroot-lvm-snapshot.cc
@@ -149,14 +149,14 @@ chroot_lvm_snapshot::setup_lock (SetupType type,
 	      (type == RUN_STOP && lock == true))
 	    return;
 
-	  sbuild::DeviceLock dlock(device);
+	  sbuild::device_lock dlock(device);
 	  if (lock)
 	    {
 	      try
 		{
-		  dlock.set_lock(Lock::LOCK_EXCLUSIVE, 15);
+		  dlock.set_lock(lock::LOCK_EXCLUSIVE, 15);
 		}
-	      catch (sbuild::Lock::error const& e)
+	      catch (sbuild::lock::error const& e)
 		{
 		  format fmt(_("%1%: failed to lock device: %2%"));
 		  fmt % device % e.what();
@@ -169,7 +169,7 @@ chroot_lvm_snapshot::setup_lock (SetupType type,
 		{
 		  dlock.unset_lock();
 		}
-	      catch (sbuild::Lock::error const& e)
+	      catch (sbuild::lock::error const& e)
 		{
 		  format fmt(_("%1%: failed to unlock device: %2%"));
 		  fmt % device % e.what();
diff --git a/schroot/sbuild-chroot.cc b/schroot/sbuild-chroot.cc
index 08a26b3b..d3712025 100644
--- a/schroot/sbuild-chroot.cc
+++ b/schroot/sbuild-chroot.cc
@@ -256,12 +256,12 @@ sbuild::chroot::setup_session_info (bool start)
       std::ostream output(&fdbuf);
       output.imbue(std::locale("C"));
 
-      sbuild::FileLock lock(fd);
+      sbuild::file_lock lock(fd);
       try
 	{
-	  lock.set_lock(Lock::LOCK_EXCLUSIVE, 2);
+	  lock.set_lock(lock::LOCK_EXCLUSIVE, 2);
 	}
-      catch (Lock::error const& e)
+      catch (lock::error const& e)
 	{
 	  format fmt(_("%1%: lock acquisition failure: %2%\n"));
 	  fmt % file % e.what();
@@ -276,7 +276,7 @@ sbuild::chroot::setup_session_info (bool start)
 	{
 	  lock.unset_lock();
 	}
-      catch (Lock::error const& e)
+      catch (lock::error const& e)
 	{
 	  format fmt(_("%1%: lock discard failure: %2%\n"));
 	  fmt % file % e.what();
diff --git a/schroot/sbuild-lock.cc b/schroot/sbuild-lock.cc
index 8e834353..72441d18 100644
--- a/schroot/sbuild-lock.cc
+++ b/schroot/sbuild-lock.cc
@@ -54,17 +54,17 @@ namespace
   }
 }
 
-Lock::Lock():
+lock::lock():
   saved_signals()
 {
 }
 
-Lock::~Lock()
+lock::~lock()
 {
 }
 
 void
-Lock::set_alarm ()
+lock::set_alarm ()
 {
   struct sigaction new_sa;
   sigemptyset(&new_sa.sa_mask);
@@ -80,14 +80,14 @@ Lock::set_alarm ()
 }
 
 void
-Lock::clear_alarm ()
+lock::clear_alarm ()
 {
   /* Restore original handler */
   sigaction (SIGALRM, &this->saved_signals, NULL);
 }
 
 void
-Lock::set_timer(struct itimerval const& timer)
+lock::set_timer(struct itimerval const& timer)
 {
   set_alarm();
 
@@ -101,7 +101,7 @@ Lock::set_timer(struct itimerval const& timer)
 }
 
 void
-Lock::unset_timer()
+lock::unset_timer()
 {
   struct itimerval disable_timer;
   disable_timer.it_interval.tv_sec = disable_timer.it_interval.tv_usec = 0;
@@ -118,19 +118,19 @@ Lock::unset_timer()
   clear_alarm();
 }
 
-FileLock::FileLock (int fd):
-  Lock(),
+file_lock::file_lock (int fd):
+  lock(),
   fd(fd)
 {
 }
 
-FileLock::~FileLock()
+file_lock::~file_lock()
 {
 }
 
 void
-FileLock::set_lock (Type         lock_type,
-		    unsigned int timeout)
+file_lock::set_lock (type         lock_type,
+		     unsigned int timeout)
 {
   try
     {
@@ -182,24 +182,24 @@ FileLock::set_lock (Type         lock_type,
 }
 
 void
-FileLock::unset_lock ()
+file_lock::unset_lock ()
 {
   set_lock(LOCK_NONE, 0);
 }
 
-DeviceLock::DeviceLock (std::string const& device):
-  Lock(),
+device_lock::device_lock (std::string const& device):
+  lock(),
   device(device)
 {
 }
 
-DeviceLock::~DeviceLock()
+device_lock::~device_lock()
 {
 }
 
 void
-DeviceLock::set_lock (Type         lock_type,
-		      unsigned int timeout)
+device_lock::set_lock (type         lock_type,
+		       unsigned int timeout)
 {
   try
     {
@@ -274,7 +274,7 @@ DeviceLock::set_lock (Type         lock_type,
 }
 
 void
-DeviceLock::unset_lock ()
+device_lock::unset_lock ()
 {
   set_lock(LOCK_NONE, 0);
 }
diff --git a/schroot/sbuild-lock.h b/schroot/sbuild-lock.h
index 57f5031f..35d36ca6 100644
--- a/schroot/sbuild-lock.h
+++ b/schroot/sbuild-lock.h
@@ -36,11 +36,11 @@ namespace sbuild
    * Advisory locking.  This class defines a simple interface for
    * shared and exclusive locks.
    */
-  class Lock
+  class lock
   {
   public:
     /// Lock type.
-    enum Type
+    enum type
       {
 	LOCK_SHARED    = F_RDLCK, ///< A shared (read) lock.
 	LOCK_EXCLUSIVE = F_WRLCK, ///< An exclusive (write) lock.
@@ -48,7 +48,7 @@ namespace sbuild
       };
 
     /// Exception type.
-    typedef runtime_error_custom<Lock> error;
+    typedef runtime_error_custom<lock> error;
 
     /**
      * Acquire a lock.
@@ -57,7 +57,7 @@ namespace sbuild
      * @param timeout the time in seconds to wait on the lock.
      */
     virtual void
-    set_lock (Type         lock_type,
+    set_lock (type         lock_type,
 	      unsigned int timeout) = 0;
 
     /**
@@ -69,9 +69,9 @@ namespace sbuild
 
   protected:
     /// The constructor.
-    Lock();
+    lock();
     /// The destructor.
-    virtual ~Lock();
+    virtual ~lock();
 
     /**
      * Set the SIGALARM handler.
@@ -115,10 +115,10 @@ namespace sbuild
   };
 
   /**
-   * File locks.  Simple whole-file shared and exclusive advisory
+   * File lock.  Simple whole-file shared and exclusive advisory
    * locking based upon POSIX fcntl byte region locks.
    */
-  class FileLock : public Lock
+  class file_lock : public lock
   {
   public:
     /**
@@ -126,13 +126,13 @@ namespace sbuild
      *
      * @param fd the file descriptor to lock.
      */
-    FileLock (int fd);
+    file_lock (int fd);
 
     /// The destructor.
-    virtual ~FileLock();
+    virtual ~file_lock();
 
     void
-    set_lock (Type         lock_type,
+    set_lock (type         lock_type,
 	      unsigned int timeout);
 
     void
@@ -144,12 +144,12 @@ namespace sbuild
   };
 
   /**
-   * Set an advisory lock on a device.  The lock is acquired using
-   * liblockdev lock_dev().  Note that a lock_type of LOCK_SHARED is
-   * equivalent to LOCK_EXCLUSIVE, because this lock type does not
-   * support shared locks.
+   * Device lock.  Set an advisory lock on a device.  The lock is
+   * acquired using liblockdev lock_dev().  Note that a lock_type of
+   * LOCK_SHARED is equivalent to LOCK_EXCLUSIVE, because this lock
+   * type does not support shared locks.
    */
-  class DeviceLock : public Lock
+  class device_lock : public lock
   {
   public:
     /**
@@ -157,11 +157,11 @@ namespace sbuild
      *
      * @param device the device to lock (full pathname).
      */
-    DeviceLock (std::string const& device);
-    virtual ~DeviceLock();
+    device_lock (std::string const& device);
+    virtual ~device_lock();
 
     void
-    set_lock (Type         lock_type,
+    set_lock (type         lock_type,
 	      unsigned int timeout);
 
     void
diff --git a/test/sbuild-lock.cc b/test/sbuild-lock.cc
index 8994299e..834d8c32 100644
--- a/test/sbuild-lock.cc
+++ b/test/sbuild-lock.cc
@@ -39,15 +39,15 @@ class test_file_lock : public TestFixture
   CPPUNIT_TEST(test_none_excl_lock);
   CPPUNIT_TEST(test_shr_none_lock);
   CPPUNIT_TEST(test_shr_shr_lock);
-  CPPUNIT_TEST_EXCEPTION(test_shr_excl_lock, sbuild::Lock::error);
+  CPPUNIT_TEST_EXCEPTION(test_shr_excl_lock, sbuild::lock::error);
   CPPUNIT_TEST(test_excl_none_lock);
-  CPPUNIT_TEST_EXCEPTION(test_excl_shr_lock, sbuild::Lock::error);
-  CPPUNIT_TEST_EXCEPTION(test_excl_excl_lock, sbuild::Lock::error);
+  CPPUNIT_TEST_EXCEPTION(test_excl_shr_lock, sbuild::lock::error);
+  CPPUNIT_TEST_EXCEPTION(test_excl_excl_lock, sbuild::lock::error);
   CPPUNIT_TEST_SUITE_END();
 
 protected:
   int fd;
-  sbuild::FileLock *lck;
+  sbuild::file_lock *lck;
 
 public:
   test_file_lock():
@@ -67,9 +67,9 @@ public:
     int fd = open(SRCDIR "/filelock.ex1", O_RDWR|O_EXCL|O_CREAT, 0600);
     CPPUNIT_ASSERT(write(fd,
 			 "This file exists in order to test "
-			 "sbuild::FileLock locking.\n", 60) == 60);
+			 "sbuild::file_lock locking.\n", 60) == 60);
     CPPUNIT_ASSERT(fd >= 0);
-    this->lck = new sbuild::FileLock(fd);
+    this->lck = new sbuild::file_lock(fd);
   }
 
   void tearDown()
@@ -80,8 +80,8 @@ public:
     CPPUNIT_ASSERT(unlink(SRCDIR "/filelock.ex1") == 0);
   }
 
-  void test(sbuild::Lock::Type initial,
-	    sbuild::Lock::Type establish)
+  void test(sbuild::lock::type initial,
+	    sbuild::lock::type establish)
   {
     this->lck->unset_lock();
     int pid = fork();
@@ -132,47 +132,47 @@ public:
 
   void test_none_none_lock()
   {
-    test(sbuild::Lock::LOCK_NONE, sbuild::Lock::LOCK_NONE);
+    test(sbuild::lock::LOCK_NONE, sbuild::lock::LOCK_NONE);
   }
 
   void test_none_shr_lock()
   {
-    test(sbuild::Lock::LOCK_NONE, sbuild::Lock::LOCK_SHARED);
+    test(sbuild::lock::LOCK_NONE, sbuild::lock::LOCK_SHARED);
   }
 
   void test_none_excl_lock()
   {
-    test(sbuild::Lock::LOCK_NONE, sbuild::Lock::LOCK_EXCLUSIVE);
+    test(sbuild::lock::LOCK_NONE, sbuild::lock::LOCK_EXCLUSIVE);
   }
 
   void test_shr_none_lock()
   {
-    test(sbuild::Lock::LOCK_SHARED, sbuild::Lock::LOCK_NONE);
+    test(sbuild::lock::LOCK_SHARED, sbuild::lock::LOCK_NONE);
   }
 
   void test_shr_shr_lock()
   {
-    test(sbuild::Lock::LOCK_SHARED, sbuild::Lock::LOCK_SHARED);
+    test(sbuild::lock::LOCK_SHARED, sbuild::lock::LOCK_SHARED);
   }
 
   void test_shr_excl_lock()
   {
-    test(sbuild::Lock::LOCK_SHARED, sbuild::Lock::LOCK_EXCLUSIVE);
+    test(sbuild::lock::LOCK_SHARED, sbuild::lock::LOCK_EXCLUSIVE);
   }
 
   void test_excl_none_lock()
   {
-    test(sbuild::Lock::LOCK_EXCLUSIVE, sbuild::Lock::LOCK_NONE);
+    test(sbuild::lock::LOCK_EXCLUSIVE, sbuild::lock::LOCK_NONE);
   }
 
   void test_excl_shr_lock()
   {
-    test(sbuild::Lock::LOCK_EXCLUSIVE, sbuild::Lock::LOCK_SHARED);
+    test(sbuild::lock::LOCK_EXCLUSIVE, sbuild::lock::LOCK_SHARED);
   }
 
   void test_excl_excl_lock()
   {
-    test(sbuild::Lock::LOCK_EXCLUSIVE, sbuild::Lock::LOCK_EXCLUSIVE);
+    test(sbuild::lock::LOCK_EXCLUSIVE, sbuild::lock::LOCK_EXCLUSIVE);
   }
 };
 
@@ -185,16 +185,16 @@ class test_dev_lock : public TestFixture
   CPPUNIT_TEST(test_none_shr_lock);
   CPPUNIT_TEST(test_none_excl_lock);
   CPPUNIT_TEST(test_shr_none_lock);
-  CPPUNIT_TEST_EXCEPTION(test_shr_shr_lock, sbuild::Lock::error);
-  CPPUNIT_TEST_EXCEPTION(test_shr_excl_lock, sbuild::Lock::error);
+  CPPUNIT_TEST_EXCEPTION(test_shr_shr_lock, sbuild::lock::error);
+  CPPUNIT_TEST_EXCEPTION(test_shr_excl_lock, sbuild::lock::error);
   CPPUNIT_TEST(test_excl_none_lock);
-  CPPUNIT_TEST_EXCEPTION(test_excl_shr_lock, sbuild::Lock::error);
-  CPPUNIT_TEST_EXCEPTION(test_excl_excl_lock, sbuild::Lock::error);
+  CPPUNIT_TEST_EXCEPTION(test_excl_shr_lock, sbuild::lock::error);
+  CPPUNIT_TEST_EXCEPTION(test_excl_excl_lock, sbuild::lock::error);
   CPPUNIT_TEST_SUITE_END();
 
 protected:
   int fd;
-  sbuild::DeviceLock *lck;
+  sbuild::device_lock *lck;
 
 public:
   test_dev_lock():
@@ -216,7 +216,7 @@ public:
   void setUp()
   {
     unlock();
-    this->lck = new sbuild::DeviceLock("/dev/null");
+    this->lck = new sbuild::device_lock("/dev/null");
   }
 
   void tearDown()
@@ -224,8 +224,8 @@ public:
     delete this->lck;
   }
 
-  void test(sbuild::Lock::Type initial,
-	    sbuild::Lock::Type establish)
+  void test(sbuild::lock::type initial,
+	    sbuild::lock::type establish)
   {
     unlock();
     int pid = fork();
@@ -277,47 +277,47 @@ public:
 
   void test_none_none_lock()
   {
-    test(sbuild::Lock::LOCK_NONE, sbuild::Lock::LOCK_NONE);
+    test(sbuild::lock::LOCK_NONE, sbuild::lock::LOCK_NONE);
   }
 
   void test_none_shr_lock()
   {
-    test(sbuild::Lock::LOCK_NONE, sbuild::Lock::LOCK_SHARED);
+    test(sbuild::lock::LOCK_NONE, sbuild::lock::LOCK_SHARED);
   }
 
   void test_none_excl_lock()
   {
-    test(sbuild::Lock::LOCK_NONE, sbuild::Lock::LOCK_EXCLUSIVE);
+    test(sbuild::lock::LOCK_NONE, sbuild::lock::LOCK_EXCLUSIVE);
   }
 
   void test_shr_none_lock()
   {
-    test(sbuild::Lock::LOCK_SHARED, sbuild::Lock::LOCK_NONE);
+    test(sbuild::lock::LOCK_SHARED, sbuild::lock::LOCK_NONE);
   }
 
   void test_shr_shr_lock()
   {
-    test(sbuild::Lock::LOCK_SHARED, sbuild::Lock::LOCK_SHARED);
+    test(sbuild::lock::LOCK_SHARED, sbuild::lock::LOCK_SHARED);
   }
 
   void test_shr_excl_lock()
   {
-    test(sbuild::Lock::LOCK_SHARED, sbuild::Lock::LOCK_EXCLUSIVE);
+    test(sbuild::lock::LOCK_SHARED, sbuild::lock::LOCK_EXCLUSIVE);
   }
 
   void test_excl_none_lock()
   {
-    test(sbuild::Lock::LOCK_EXCLUSIVE, sbuild::Lock::LOCK_NONE);
+    test(sbuild::lock::LOCK_EXCLUSIVE, sbuild::lock::LOCK_NONE);
   }
 
   void test_excl_shr_lock()
   {
-    test(sbuild::Lock::LOCK_EXCLUSIVE, sbuild::Lock::LOCK_SHARED);
+    test(sbuild::lock::LOCK_EXCLUSIVE, sbuild::lock::LOCK_SHARED);
   }
 
   void test_excl_excl_lock()
   {
-    test(sbuild::Lock::LOCK_EXCLUSIVE, sbuild::Lock::LOCK_EXCLUSIVE);
+    test(sbuild::lock::LOCK_EXCLUSIVE, sbuild::lock::LOCK_EXCLUSIVE);
   }
 };