From 565d7a83d34df7ffefd84470006fa935570f4aee Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Wed, 20 Jan 2016 14:49:04 -0600 Subject: [PATCH] rename ambiguous function openstack_process_metadata -> openstack_process_metadata_file --- src/datasources/openstack.c | 6 +++--- src/datasources/openstack.h | 2 +- src/main.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/datasources/openstack.c b/src/datasources/openstack.c index 76ae0ba..329d09a 100644 --- a/src/datasources/openstack.c +++ b/src/datasources/openstack.c @@ -181,7 +181,7 @@ gboolean openstack_process_config_drive(const gchar* path) { if (process_metadata) { g_snprintf(metadata_drive_path, PATH_MAX, "%s%s", config_drive_path, METADATA_DRIVE_PATH); - if (!openstack_process_metadata(metadata_drive_path)) { + if (!openstack_process_metadata_file(metadata_drive_path)) { LOG(MOD "Using config drive get and process metadata failed\n"); goto fail3; } @@ -231,7 +231,7 @@ fail1: return result; } -gboolean openstack_process_metadata(const gchar* filename) { +gboolean openstack_process_metadata_file(const gchar* filename) { GError* error = NULL; JsonParser* parser = NULL; GNode* node = NULL; @@ -292,7 +292,7 @@ static gboolean openstack_use_metadata_service(void) { goto fail1; } - result = openstack_process_metadata(data_filename); + result = openstack_process_metadata_file(data_filename); g_free(data_filename); data_filename = NULL; diff --git a/src/datasources/openstack.h b/src/datasources/openstack.h index 08bf1ee..6f9badc 100644 --- a/src/datasources/openstack.h +++ b/src/datasources/openstack.h @@ -34,6 +34,6 @@ #include -gboolean openstack_process_metadata(const gchar* filename); +gboolean openstack_process_metadata_file(const gchar* filename); gboolean openstack_process_config_drive(const gchar* path); diff --git a/src/main.c b/src/main.c index 576428a..b1b6700 100644 --- a/src/main.c +++ b/src/main.c @@ -340,7 +340,7 @@ int main(int argc, char *argv[]) { if (realpath(tmp_metadata_filename, metadata_filename)) { switch (datasource) { case DS_OPENSTACK: - if (!openstack_process_metadata(metadata_filename)) { + if (!openstack_process_metadata_file(metadata_filename)) { result_code = EXIT_FAILURE; } break;