Author: sandervanderburg
Date: Sat Oct 16 23:17:35 2010
New Revision: 24323
URL: https://svn.nixos.org/websvn/nix/?rev=24323&sc=1
Log:
Renamed target_interface into target_property for concistency
Modified:
disnix/disnix/trunk/src/activate/transition.c
disnix/disnix/trunk/src/libmanifest/activationmapping.c
disnix/disnix/trunk/src/libmanifest/activationmapping.h
disnix/disnix/trunk/src/visualize/clustertable.c
disnix/disnix/trunk/src/visualize/edgestable.c
Modified: disnix/disnix/trunk/src/activate/transition.c
==============================================================================
--- disnix/disnix/trunk/src/activate/transition.c Sat Oct 16 23:07:16
2010 (r24322)
+++ disnix/disnix/trunk/src/activate/transition.c Sat Oct 16 23:17:35
2010 (r24323)
@@ -60,10 +60,10 @@
unsigned int arguments_size = g_strv_length(arguments);
/* Get the target interface property from the mapping */
- gchar *target_interface = get_target_interface(actual_mapping);
+ gchar *target_property = get_target_property(actual_mapping);
/* Print debug message */
- g_print("Now activating service: %s of type: %s through: %s\n",
actual_mapping->service, actual_mapping->type, target_interface);
+ g_print("Now activating service: %s of type: %s through: %s\n",
actual_mapping->service, actual_mapping->type, target_property);
g_print("Using arguments: ");
for(i = 0; i < arguments_size; i++)
@@ -72,7 +72,7 @@
g_print("\n");
/* Execute the activation operation */
- status = wait_to_finish(exec_activate(interface, target_interface,
actual_mapping->type, arguments, arguments_size, actual_mapping->service));
+ status = wait_to_finish(exec_activate(interface, target_property,
actual_mapping->type, arguments, arguments_size, actual_mapping->service));
/* Cleanup */
g_strfreev(arguments);
@@ -125,10 +125,10 @@
unsigned int arguments_size = g_strv_length(arguments);
/* Get the target interface property from the mapping */
- gchar *target_interface = get_target_interface(actual_mapping);
+ gchar *target_property = get_target_property(actual_mapping);
/* Print debug message */
- g_print("Now deactivating service: %s of type: %s through: %s\n",
actual_mapping->service, actual_mapping->type, target_interface);
+ g_print("Now deactivating service: %s of type: %s through: %s\n",
actual_mapping->service, actual_mapping->type, target_property);
g_print("Using arguments: ");
for(i = 0; i < arguments_size; i++)
@@ -137,7 +137,7 @@
g_print("\n");
/* Execute the deactivation operation */
- status = wait_to_finish(exec_deactivate(interface, target_interface,
actual_mapping->type, arguments, arguments_size, actual_mapping->service));
+ status = wait_to_finish(exec_deactivate(interface, target_property,
actual_mapping->type, arguments, arguments_size, actual_mapping->service));
/* Cleanup */
g_free(arguments);
Modified: disnix/disnix/trunk/src/libmanifest/activationmapping.c
==============================================================================
--- disnix/disnix/trunk/src/libmanifest/activationmapping.c Sat Oct 16
23:07:16 2010 (r24322)
+++ disnix/disnix/trunk/src/libmanifest/activationmapping.c Sat Oct 16
23:17:35 2010 (r24323)
@@ -448,7 +448,7 @@
return arguments;
}
-gchar *get_target_interface(ActivationMapping *mapping)
+gchar *get_target_property(ActivationMapping *mapping)
{
unsigned int i;
Modified: disnix/disnix/trunk/src/libmanifest/activationmapping.h
==============================================================================
--- disnix/disnix/trunk/src/libmanifest/activationmapping.h Sat Oct 16
23:07:16 2010 (r24322)
+++ disnix/disnix/trunk/src/libmanifest/activationmapping.h Sat Oct 16
23:17:35 2010 (r24323)
@@ -143,7 +143,7 @@
* @param mapping Activation mapping
* @return The target interface value
*/
-gchar *get_target_interface(ActivationMapping *mapping);
+gchar *get_target_property(ActivationMapping *mapping);
/**
* Searches for all the mappings in an array that have an inter-dependency
Modified: disnix/disnix/trunk/src/visualize/clustertable.c
==============================================================================
--- disnix/disnix/trunk/src/visualize/clustertable.c Sat Oct 16 23:07:16
2010 (r24322)
+++ disnix/disnix/trunk/src/visualize/clustertable.c Sat Oct 16 23:17:35
2010 (r24323)
@@ -34,7 +34,7 @@
ActivationMapping *mapping = g_array_index(activation_array,
ActivationMapping*, i);
/* Get target property of the current mapping item */
- gchar *target = get_target_interface(mapping);
+ gchar *target = get_target_property(mapping);
/* See whether the target already exists in the table */
GArray *services_array = g_hash_table_lookup(cluster_table, target);
Modified: disnix/disnix/trunk/src/visualize/edgestable.c
==============================================================================
--- disnix/disnix/trunk/src/visualize/edgestable.c Sat Oct 16 23:07:16
2010 (r24322)
+++ disnix/disnix/trunk/src/visualize/edgestable.c Sat Oct 16 23:17:35
2010 (r24323)
@@ -33,7 +33,7 @@
ActivationMapping *mapping = g_array_index(activation_array,
ActivationMapping*, i);
/* Retrieve the target property */
- gchar *target = get_target_interface(mapping);
+ gchar *target = get_target_property(mapping);
/* Generate an edge table key, which consist of Nix store
component:targetProperty */
gchar *mapping_key = g_strconcat(mapping->service, ":", target, NULL);
@@ -70,7 +70,7 @@
actual_mapping = g_array_index(activation_array,
ActivationMapping*, actual_mapping_index);
/* Get the target interface */
- target = get_target_interface(actual_mapping);
+ target = get_target_property(actual_mapping);
/* Generate mapping value from the service and target property
*/
mapping_value = g_strconcat(actual_mapping->service, ":",
target, NULL);
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
