Rename DropPrivs() to DropPrivileges()

Git-Dch: ignore

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 82f2fb3ce091e51c9e11afe88f21bedc60bef096..d116994e64ed61937bfa3ac0b43618ab6b6f3172 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -124,7 +124,7 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
 /* */
 void pkgAcqMethod::DropPrivsOrDie()
 {
-   if (!DropPrivs()) {
+   if (!DropPrivileges()) {
       Fail(false);
       exit(112);       /* call the european emergency number */
    }

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index df409fa36b54e21eeebc1eeef0bb6f51e2b7cb8f..1e1fb595720a98401fcb3b986cb51b3b0a55de82 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -2171,7 +2171,7 @@ bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode)
    return true;
 }
 
-bool DropPrivs()
+bool DropPrivileges()
 {
    // uid will be 0 in the end, but gid might be different anyway
    uid_t old_uid = getuid();

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 9dd29eb9ea6fbb7b8c671ceeddc2d435d0a010da..a64d6cb98bc1d76b92cf1748851e3fe903a9f597 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -210,7 +210,7 @@ bool StartsWithGPGClearTextSignature(std::string const &FileName);
  *
  * \return true on success, false on failure with _error set
  */
-bool DropPrivs();
+bool DropPrivileges();
 
 // File string manipulators
 std::string flNotDir(std::string File);

diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index 424764b3c35c5461e9ec3f8bf963f3a91480b0b6..f765234c5f8b61d5fc2a729e76d39699b277e047 100644 (file)
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -41,7 +41,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
                return 0;
        }
         // we really don't need anything
-        DropPrivs();
+        DropPrivileges();
 
        FILE* input = fdopen(STDIN_FILENO, "r");
        FILE* output = fopen("/tmp/dump.edsp", "w");

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 0f2ec6283d04a268e2bcc69189b30e6fe3634a98..92a4429e5789a408a7b4c8350b11300c3c18327e 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -77,7 +77,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
                {0,0,0,0}};
 
         // we really don't need anything
-        DropPrivs();
+        DropPrivileges();
 
        CommandLine CmdL(Args,_config);
        if (pkgInitConfig(*_config) == false ||