Expanded GnomeKeyringLoader macros

chrome/browser/password_manager/native_backend_gnome_x.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
 
 #include <dlfcn.h>
 #include <gnome-keyring.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 24 matching lines @@
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 using content::BrowserThread;
 using namespace password_manager::metrics_util;
 using password_manager::PasswordStore;
 
 namespace {
 const int kMaxPossibleTimeTValue = std::numeric_limits<int>::max();
 }
 
-#define GNOME_KEYRING_DEFINE_POINTER(name) \
-  typeof(&::gnome_keyring_##name) GnomeKeyringLoader::gnome_keyring_##name;
-GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DEFINE_POINTER)
-#undef GNOME_KEYRING_DEFINE_POINTER
+typeof(&::gnome_keyring_is_available)

[vasilii, 2016/08/01 09:51:26]

decltype

[cfroussios, 2016/08/01 10:54:52]

Done.

+    GnomeKeyringLoader::gnome_keyring_is_available;
+typeof(&::gnome_keyring_store_password)
+    GnomeKeyringLoader::gnome_keyring_store_password;
+typeof(&::gnome_keyring_delete_password)
+    GnomeKeyringLoader::gnome_keyring_delete_password;
+typeof(&::gnome_keyring_find_items)
+    GnomeKeyringLoader::gnome_keyring_find_items;
+typeof(&::gnome_keyring_result_to_message)
+    GnomeKeyringLoader::gnome_keyring_result_to_message;
+typeof(&::gnome_keyring_attribute_list_free)
+    GnomeKeyringLoader::gnome_keyring_attribute_list_free;
+typeof(&::gnome_keyring_attribute_list_new)
+    GnomeKeyringLoader::gnome_keyring_attribute_list_new;
+typeof(&::gnome_keyring_attribute_list_append_string)
+    GnomeKeyringLoader::gnome_keyring_attribute_list_append_string;
+typeof(&::gnome_keyring_attribute_list_append_uint32)
+    GnomeKeyringLoader::gnome_keyring_attribute_list_append_uint32;
 
 bool GnomeKeyringLoader::keyring_loaded = false;
 
-#define GNOME_KEYRING_FUNCTION_INFO(name) \
-  {"gnome_keyring_"#name, reinterpret_cast<void**>(&gnome_keyring_##name)},
 const GnomeKeyringLoader::FunctionInfo GnomeKeyringLoader::functions[] = {
-  GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_FUNCTION_INFO)
-  {nullptr, nullptr}
-};
-#undef GNOME_KEYRING_FUNCTION_INFO
+    {"gnome_keyring_is_available",
+     reinterpret_cast<void**>(&gnome_keyring_is_available)},

[vasilii, 2016/08/01 09:51:26]

Will static_cast work here?

[cfroussios, 2016/08/01 10:54:52]

The compiler does not allow it.

+    {"gnome_keyring_store_password",
+     reinterpret_cast<void**>(&gnome_keyring_store_password)},
+    {"gnome_keyring_delete_password",
+     reinterpret_cast<void**>(&gnome_keyring_delete_password)},
+    {"gnome_keyring_find_items",
+     reinterpret_cast<void**>(&gnome_keyring_find_items)},
+    {"gnome_keyring_result_to_message",
+     reinterpret_cast<void**>(&gnome_keyring_result_to_message)},
+    {"gnome_keyring_attribute_list_free",
+     reinterpret_cast<void**>(&gnome_keyring_attribute_list_free)},
+    {"gnome_keyring_attribute_list_new",
+     reinterpret_cast<void**>(&gnome_keyring_attribute_list_new)},
+    {"gnome_keyring_attribute_list_append_string",
+     reinterpret_cast<void**>(&gnome_keyring_attribute_list_append_string)},
+    {"gnome_keyring_attribute_list_append_uint32",
+     reinterpret_cast<void**>(&gnome_keyring_attribute_list_append_uint32)}};
 
 /* Load the library and initialize the function pointers. */
 bool GnomeKeyringLoader::LoadGnomeKeyring() {
   if (keyring_loaded)
     return true;
 
   void* handle = dlopen("libgnome-keyring.so.0", RTLD_NOW | RTLD_GLOBAL);
   if (!handle) {
     // We wanted to use GNOME Keyring, but we couldn't load it. Warn, because
     // either the user asked for this, or we autodetected it incorrectly. (Or
@@ skipping 755 matching lines @@
   ScopedVector<PasswordForm> forms;
   if (!GetLoginsBetween(get_begin, get_end, date_to_compare, &forms))
     return false;
 
   for (size_t i = 0; i < forms.size(); ++i) {
     if (!RemoveLogin(*forms[i], changes))
       return false;
   }
   return true;
 }