ソースを参照

Use c++11 for loop in AptHistoryRequestingUser

Git-Dch: ignore
Michael Vogt 10 年 前
コミット
48fe8dff59
共有1 個のファイルを変更した4 個の追加6 個の削除を含む
  1. 4 6
      apt-pkg/deb/dpkgpm.cc

+ 4 - 6
apt-pkg/deb/dpkgpm.cc

@@ -58,15 +58,13 @@ using namespace std;
 APT_PURE static string
 APT_PURE static string
 AptHistoryRequestingUser()
 AptHistoryRequestingUser()
 {
 {
-   const char* env[]{
-      "SUDO_UID", "PKEXEC_UID", "PACKAGEKIT_CALLER_UID", nullptr
-   };
+   const char* EnvKeys[]{"SUDO_UID", "PKEXEC_UID", "PACKAGEKIT_CALLER_UID"};
 
 
-   for (int i=0; env[i] != nullptr; i++)
+   for (const auto &Key: EnvKeys)
    {
    {
-      if (getenv(env[i]) != nullptr)
+      if (getenv(Key) != nullptr)
       {
       {
-         int uid = atoi(getenv(env[i]));
+         int uid = atoi(getenv(Key));
          if (uid > 0) {
          if (uid > 0) {
             struct passwd pwd;
             struct passwd pwd;
             struct passwd *result;
             struct passwd *result;