[asterisk-commits] rmudgett: trunk r403528 - in /trunk: ./ main/sorcery.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Dec  9 12:14:41 2013
New Revision: 403528

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403528
Log:
sorcery: Whitespace

You would think that a new file would start off without any whitespace
oddities.
........

Merged revisions 403527 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/sorcery.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Mon Dec  9 12:14:41 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403398,403435,403458,403510
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403398,403435,403458,403510,403527

Modified: trunk/main/sorcery.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/sorcery.c?view=diff&rev=403528&r1=403527&r2=403528
==============================================================================
--- trunk/main/sorcery.c (original)
+++ trunk/main/sorcery.c Mon Dec  9 12:14:41 2013
@@ -472,7 +472,7 @@
 /*! \brief Internal function which creates an object type and adds a wizard mapping */
 static int sorcery_apply_wizard_mapping(struct ast_sorcery *sorcery, const char *type, const char *module, const char *name, const char *data, unsigned int caching)
 {
-	RAII_VAR(struct ast_sorcery_object_type *, object_type,  ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup);
+	RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup);
 	RAII_VAR(struct ast_sorcery_wizard *, wizard, ao2_find(wizards, name, OBJ_KEY), ao2_cleanup);
 	RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, ao2_alloc(sizeof(*object_wizard), sorcery_object_wizard_destructor), ao2_cleanup);
 	int created = 0;
@@ -547,7 +547,7 @@
 
 int __ast_sorcery_apply_default(struct ast_sorcery *sorcery, const char *type, const char *module, const char *name, const char *data)
 {
-	RAII_VAR(struct ast_sorcery_object_type *, object_type,  ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup);
+	RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup);
 
 	/* Defaults can not be added if any existing mapping exists */
 	if (object_type) {
@@ -682,13 +682,13 @@
 		__aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, no_doc, argc);
 	} else if (argc == 1) {
 		__aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, no_doc, argc,
-				      object_field->args[0]);
+			object_field->args[0]);
 	} else if (argc == 2) {
 		__aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, no_doc, argc,
-				      object_field->args[0], object_field->args[1]);
+			object_field->args[0], object_field->args[1]);
 	} else if (argc == 3) {
 		__aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, no_doc, argc,
-				      object_field->args[0], object_field->args[1], object_field->args[2]);
+			object_field->args[0], object_field->args[1], object_field->args[2]);
 	} else {
 		ast_assert(0); /* The hack... she does us no good for this */
 	}
@@ -1081,7 +1081,7 @@
 	struct ast_sorcery_object_details *details;
 
 	if (!object_type || !object_type->type.item_alloc ||
-	    !(details = object_type->type.item_alloc(id))) {
+		!(details = object_type->type.item_alloc(id))) {
 		return NULL;
 	}
 
@@ -1194,7 +1194,7 @@
 	i = ao2_iterator_init(object_type->wizards, 0);
 	for (; (wizard = ao2_iterator_next(&i)); ao2_ref(wizard, -1)) {
 		if (wizard->wizard->retrieve_id &&
-		    !(object = wizard->wizard->retrieve_id(sorcery, wizard->data, object_type->name, id))) {
+			!(object = wizard->wizard->retrieve_id(sorcery, wizard->data, object_type->name, id))) {
 			continue;
 		}
 
@@ -1203,7 +1203,7 @@
 		ao2_ref(wizard, -1);
 		break;
 	}
-        ao2_iterator_destroy(&i);
+	ao2_iterator_destroy(&i);
 
 	if (!cached && object) {
 		ao2_callback(object_type->wizards, 0, sorcery_cache_create, object);