Correct some ugly indentation.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2563 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/coroipcs.c

@@ -946,31 +946,31 @@ extern void coroipcs_ipc_init (
 	/* v2 api */
 	api->stats_create_connection	= dummy_stats_create_connection;
 	api->stats_destroy_connection	= dummy_stats_destroy_connection;
-	api->stats_update_value			= dummy_stats_update_value;
-	api->stats_increment_value		= dummy_stats_increment_value;
-	api->log_printf					= NULL;
+	api->stats_update_value		= dummy_stats_update_value;
+	api->stats_increment_value	= dummy_stats_increment_value;
+	api->log_printf			= NULL;
 
 	/* v1 api */
-	api->socket_name				= init_state->socket_name;
-	api->sched_policy				= init_state->sched_policy;
-	api->sched_param				= init_state->sched_param;
-	api->malloc						= init_state->malloc;
-	api->free						= init_state->free;
-	api->old_log_printf				= init_state->log_printf;
-	api->fatal_error				= init_state->fatal_error;
-	api->security_valid				= init_state->security_valid;
-	api->service_available			= init_state->service_available;
-	api->private_data_size_get		= init_state->private_data_size_get;
-	api->serialize_lock				= init_state->serialize_lock;
-	api->serialize_unlock			= init_state->serialize_unlock;
-	api->sending_allowed			= init_state->sending_allowed;
+	api->socket_name		= init_state->socket_name;
+	api->sched_policy		= init_state->sched_policy;
+	api->sched_param		= init_state->sched_param;
+	api->malloc			= init_state->malloc;
+	api->free			= init_state->free;
+	api->old_log_printf		= init_state->log_printf;
+	api->fatal_error		= init_state->fatal_error;
+	api->security_valid		= init_state->security_valid;
+	api->service_available		= init_state->service_available;
+	api->private_data_size_get	= init_state->private_data_size_get;
+	api->serialize_lock		= init_state->serialize_lock;
+	api->serialize_unlock		= init_state->serialize_unlock;
+	api->sending_allowed		= init_state->sending_allowed;
 	api->sending_allowed_release	= init_state->sending_allowed_release;
-	api->poll_accept_add			= init_state->poll_accept_add;
-	api->poll_dispatch_add			= init_state->poll_dispatch_add;
-	api->poll_dispatch_modify		= init_state->poll_dispatch_modify;
-	api->init_fn_get				= init_state->init_fn_get;
-	api->exit_fn_get				= init_state->exit_fn_get;
-	api->handler_fn_get				= init_state->handler_fn_get;
+	api->poll_accept_add		= init_state->poll_accept_add;
+	api->poll_dispatch_add		= init_state->poll_dispatch_add;
+	api->poll_dispatch_modify	= init_state->poll_dispatch_modify;
+	api->init_fn_get		= init_state->init_fn_get;
+	api->exit_fn_get		= init_state->exit_fn_get;
+	api->handler_fn_get		= init_state->handler_fn_get;
 
 	log_printf (LOGSYS_LEVEL_DEBUG, "you are using ipc api v1\n");
 
@@ -1321,7 +1321,7 @@ retry_recv:
 		sizeof (mar_req_priv_change),
 		MSG_NOSIGNAL);
 	if (res == -1 && errno == EINTR) {
-	api->stats_increment_value (conn_info->stats_handle, "recv_retry_count");
+		api->stats_increment_value (conn_info->stats_handle, "recv_retry_count");
 		goto retry_recv;
 	}
 	if (res == -1 && errno == EAGAIN) {
@@ -1468,15 +1468,15 @@ retry_accept:
 
 	if (new_fd == -1) {
 		log_printf (LOGSYS_LEVEL_ERROR,
-					"Could not accept Library connection: %s\n", strerror (errno));
+			"Could not accept Library connection: %s\n", strerror (errno));
 		return (0); /* This is an error, but -1 would indicate disconnect from poll loop */
 	}
 
 	res = fcntl (new_fd, F_SETFL, O_NONBLOCK);
 	if (res == -1) {
 		log_printf (LOGSYS_LEVEL_ERROR,
-					"Could not set non-blocking operation on library connection: %s\n",
-					strerror (errno));
+			"Could not set non-blocking operation on library connection: %s\n",
+			strerror (errno));
 		close (new_fd);
 		return (0); /* This is an error, but -1 would indicate disconnect from poll loop */
 	}
@@ -1560,7 +1560,7 @@ static void coroipcs_init_conn_stats (
 
 	conn->stats_handle = api->stats_create_connection (conn_name, conn->client_pid, conn->fd);
 	api->stats_update_value (conn->stats_handle, "service_id",
-								   &conn->service, sizeof(conn->service));
+		&conn->service, sizeof(conn->service));
 }
 
 int coroipcs_handler_dispatch (
@@ -1756,3 +1756,4 @@ int coroipcs_handler_dispatch (
 
 	return (0);
 }
+

exec/main.c

@@ -543,18 +543,18 @@ static void corosync_totem_stats_updater (void *data)
 		avg_token_holdtime = (total_token_holdtime / token_count);
 
 		objdb->object_key_replace (stats->mrp->srp->hdr.handle,
-				"mtt_rx_token", strlen("mtt_rx_token"),
-				&mtt_rx_token, sizeof (mtt_rx_token));
+			"mtt_rx_token", strlen("mtt_rx_token"),
+			&mtt_rx_token, sizeof (mtt_rx_token));
 		objdb->object_key_replace (stats->mrp->srp->hdr.handle,
-				"avg_token_workload", strlen("avg_token_workload"),
-				&avg_token_holdtime, sizeof (avg_backlog_calc));
+			"avg_token_workload", strlen("avg_token_workload"),
+			&avg_token_holdtime, sizeof (avg_backlog_calc));
 		objdb->object_key_replace (stats->mrp->srp->hdr.handle,
-				"avg_backlog_calc", strlen("avg_backlog_calc"),
-				&avg_backlog_calc, sizeof (avg_backlog_calc));
+			"avg_backlog_calc", strlen("avg_backlog_calc"),
+			&avg_backlog_calc, sizeof (avg_backlog_calc));
 	}
 	api->timer_add_duration (1500 * MILLI_2_NANO_SECONDS, NULL,
-					corosync_totem_stats_updater,
-					&corosync_stats_timer_handle);
+		corosync_totem_stats_updater,
+		&corosync_stats_timer_handle);
 }
 
 static void corosync_totem_stats_init (void)
@@ -574,22 +574,21 @@ static void corosync_totem_stats_init (void)
 		strlen ("runtime"),
 		&object_find_handle);
 
-	if (objdb->object_find_next (
-			object_find_handle,
+	if (objdb->object_find_next (object_find_handle,
 			&object_runtime_handle) == 0) {
 
 		objdb->object_create (object_runtime_handle,
-							  &object_totem_handle,
-							  "totem", strlen ("totem"));
+			&object_totem_handle,
+			"totem", strlen ("totem"));
 		objdb->object_create (object_totem_handle,
-							  &stats->hdr.handle,
-							  "pg", strlen ("pg"));
+			&stats->hdr.handle,
+			"pg", strlen ("pg"));
 		objdb->object_create (stats->hdr.handle,
-							  &stats->mrp->hdr.handle,
-							  "mrp", strlen ("mrp"));
+			&stats->mrp->hdr.handle,
+			"mrp", strlen ("mrp"));
 		objdb->object_create (stats->mrp->hdr.handle,
-							  &stats->mrp->srp->hdr.handle,
-							  "srp", strlen ("srp"));
+			&stats->mrp->srp->hdr.handle,
+			"srp", strlen ("srp"));
 
 		objdb->object_key_create_typed (stats->mrp->srp->hdr.handle,
 			"orf_token_tx",	&stats->mrp->srp->orf_token_tx,
@@ -608,7 +607,7 @@ static void corosync_totem_stats_init (void)
 			sizeof (stats->mrp->srp->memb_join_tx), OBJDB_VALUETYPE_UINT64);
 		objdb->object_key_create_typed (stats->mrp->srp->hdr.handle,
 			"memb_join_rx", &stats->mrp->srp->memb_join_rx,
-			 sizeof (stats->mrp->srp->memb_join_rx), OBJDB_VALUETYPE_UINT64);
+			sizeof (stats->mrp->srp->memb_join_rx), OBJDB_VALUETYPE_UINT64);
 		objdb->object_key_create_typed (stats->mrp->srp->hdr.handle,
 			"mcast_tx", &stats->mrp->srp->mcast_tx,
 			sizeof (stats->mrp->srp->mcast_tx), OBJDB_VALUETYPE_UINT64);
@@ -673,8 +672,8 @@ static void corosync_totem_stats_init (void)
 	}
 	/* start stats timer */
 	api->timer_add_duration (1500 * MILLI_2_NANO_SECONDS, NULL,
-					corosync_totem_stats_updater,
-					&corosync_stats_timer_handle);
+		corosync_totem_stats_updater,
+		&corosync_stats_timer_handle);
 
 }
 
@@ -720,8 +719,8 @@ static void deliver_fn (
 	}
 
 	objdb->object_key_increment (service_stats_handle[service][fn_id],
-								 "rx", strlen("rx"),
-								 &key_incr_dummy);
+		"rx", strlen("rx"),
+		&key_incr_dummy);
 
 	if (endian_conversion_required) {
 		assert(ais_service[service]->exec_engine[fn_id].exec_endian_convert_fn != NULL);
@@ -756,8 +755,7 @@ int main_mcast (
 
 	if (ais_service[service]) {
 		objdb->object_key_increment (service_stats_handle[service][fn_id],
-									 "tx", strlen("tx"),
-									 &key_incr_dummy);
+			"tx", strlen("tx"), &key_incr_dummy);
 	}
 
 	return (totempg_groups_mcast_joined (corosync_group_handle, iovec, iov_len, guarantee));
@@ -946,53 +944,54 @@ static hdb_handle_t corosync_stats_create_connection (const char* name,
 	hdb_handle_t object_handle;
 
 	objdb->object_key_increment (object_connection_handle,
-								 "active", strlen("active"),
-								 &key_incr_dummy);
+		"active", strlen("active"),
+		&key_incr_dummy);
+
 
 	objdb->object_create (object_connection_handle,
-						  &object_handle,
-						  name,
-						  strlen (name));
+		&object_handle,
+		name,
+		strlen (name));
 
 	objdb->object_key_create_typed (object_handle,
-									"service_id",
-									&zero_32, sizeof (zero_32),
-									OBJDB_VALUETYPE_UINT32);
+		"service_id",
+		&zero_32, sizeof (zero_32),
+		OBJDB_VALUETYPE_UINT32);
 
 	objdb->object_key_create_typed (object_handle,
-									"client_pid",
-									&pid, sizeof (pid),
-									OBJDB_VALUETYPE_INT32);
+		"client_pid",
+		&pid, sizeof (pid),
+		OBJDB_VALUETYPE_INT32);
 
 	objdb->object_key_create_typed (object_handle,
-									"responses",
-									&zero_64, sizeof (zero_64),
-									OBJDB_VALUETYPE_UINT64);
+		"responses",
+		&zero_64, sizeof (zero_64),
+		OBJDB_VALUETYPE_UINT64);
 
 	objdb->object_key_create_typed (object_handle,
-									"dispatched",
-									&zero_64, sizeof (zero_64),
-									OBJDB_VALUETYPE_UINT64);
+		"dispatched",
+		&zero_64, sizeof (zero_64),
+		OBJDB_VALUETYPE_UINT64);
 
 	objdb->object_key_create_typed (object_handle,
-									"requests",
-									&zero_64, sizeof (zero_64),
-									OBJDB_VALUETYPE_INT64);
+		"requests",
+		&zero_64, sizeof (zero_64),
+		OBJDB_VALUETYPE_INT64);
 
 	objdb->object_key_create_typed (object_handle,
-									"sem_retry_count",
-									&zero_64, sizeof (zero_64),
-									OBJDB_VALUETYPE_UINT64);
+		"sem_retry_count",
+		&zero_64, sizeof (zero_64),
+		OBJDB_VALUETYPE_UINT64);
 
 	objdb->object_key_create_typed (object_handle,
-									"send_retry_count",
-									&zero_64, sizeof (zero_64),
-									OBJDB_VALUETYPE_UINT64);
+		"send_retry_count",
+		&zero_64, sizeof (zero_64),
+		OBJDB_VALUETYPE_UINT64);
 
 	objdb->object_key_create_typed (object_handle,
-									"recv_retry_count",
-									&zero_64, sizeof (zero_64),
-									OBJDB_VALUETYPE_UINT64);
+		"recv_retry_count",
+		&zero_64, sizeof (zero_64),
+		OBJDB_VALUETYPE_UINT64);
 
 	objdb->object_key_create_typed (object_handle,
 		"flow_control",
@@ -1019,16 +1018,16 @@ static void corosync_stats_destroy_connection (hdb_handle_t handle)
 	objdb->object_destroy (handle);
 
 	objdb->object_key_increment (object_connection_handle,
-								 "closed", strlen("closed"),
-								 &key_incr_dummy);
+		"closed", strlen("closed"),
+		&key_incr_dummy);
 	objdb->object_key_decrement (object_connection_handle,
-								 "active", strlen("active"),
-								 &key_incr_dummy);
+		"active", strlen("active"),
+		&key_incr_dummy);
 }
 
 static void corosync_stats_update_value (hdb_handle_t handle,
-										 const char *name, const void *value,
-										 size_t value_len)
+	const char *name, const void *value,
+	size_t value_len)
 {
 	objdb->object_key_replace (handle,
 		name, strlen(name),
@@ -1036,7 +1035,7 @@ static void corosync_stats_update_value (hdb_handle_t handle,
 }
 
 static void corosync_stats_increment_value (hdb_handle_t handle,
-											const char* name)
+	const char* name)
 {
 	unsigned int key_incr_dummy;
 
@@ -1055,29 +1054,29 @@ static void corosync_stats_decrement_value (hdb_handle_t handle,
 }
 
 static struct coroipcs_init_state_v2 ipc_init_state_v2 = {
-	.socket_name				= COROSYNC_SOCKET_NAME,
-	.sched_policy				= SCHED_OTHER,
-	.sched_param				= &global_sched_param,
-	.malloc						= malloc,
-	.free						= free,
-	.log_printf					= _logsys_log_printf,
-	.fatal_error				= ipc_fatal_error,
-	.security_valid				= corosync_security_valid,
-	.service_available			= corosync_service_available,
+	.socket_name			= COROSYNC_SOCKET_NAME,
+	.sched_policy			= SCHED_OTHER,
+	.sched_param			= &global_sched_param,
+	.malloc				= malloc,
+	.free				= free,
+	.log_printf			= _logsys_log_printf,
+	.fatal_error			= ipc_fatal_error,
+	.security_valid			= corosync_security_valid,
+	.service_available		= corosync_service_available,
 	.private_data_size_get		= corosync_private_data_size_get,
-	.serialize_lock				= serialize_lock,
-	.serialize_unlock			= serialize_unlock,
-	.sending_allowed			= corosync_sending_allowed,
+	.serialize_lock			= serialize_lock,
+	.serialize_unlock		= serialize_unlock,
+	.sending_allowed		= corosync_sending_allowed,
 	.sending_allowed_release	= corosync_sending_allowed_release,
-	.poll_accept_add			= corosync_poll_accept_add,
-	.poll_dispatch_add			= corosync_poll_dispatch_add,
+	.poll_accept_add		= corosync_poll_accept_add,
+	.poll_dispatch_add		= corosync_poll_dispatch_add,
 	.poll_dispatch_modify		= corosync_poll_dispatch_modify,
-	.init_fn_get				= corosync_init_fn_get,
-	.exit_fn_get				= corosync_exit_fn_get,
-	.handler_fn_get				= corosync_handler_fn_get,
+	.init_fn_get			= corosync_init_fn_get,
+	.exit_fn_get			= corosync_exit_fn_get,
+	.handler_fn_get			= corosync_handler_fn_get,
 	.stats_create_connection	= corosync_stats_create_connection,
 	.stats_destroy_connection	= corosync_stats_destroy_connection,
-	.stats_update_value			= corosync_stats_update_value,
+	.stats_update_value		= corosync_stats_update_value,
 	.stats_increment_value		= corosync_stats_increment_value,
 	.stats_decrement_value		= corosync_stats_decrement_value,
 };
@@ -1131,25 +1130,25 @@ static void corosync_stats_init (void)
 	uint64_t zero_64 = 0;
 
 	objdb->object_find_create (OBJECT_PARENT_HANDLE,
-							   "runtime", strlen ("runtime"),
-							   &object_find_handle);
+		"runtime", strlen ("runtime"),
+		&object_find_handle);
 
 	if (objdb->object_find_next (object_find_handle,
-								 &object_runtime_handle) != 0) {
+			&object_runtime_handle) != 0) {
 		return;
 	}
 
 	/* Connection objects */
 	objdb->object_create (object_runtime_handle,
-						  &object_connection_handle,
-						  "connections", strlen ("connections"));
+		&object_connection_handle,
+		"connections", strlen ("connections"));
 
 	objdb->object_key_create_typed (object_connection_handle,
-									"active", &zero_64, sizeof (zero_64),
-									OBJDB_VALUETYPE_UINT64);
+		"active", &zero_64, sizeof (zero_64),
+		OBJDB_VALUETYPE_UINT64);
 	objdb->object_key_create_typed (object_connection_handle,
-									"closed", &zero_64, sizeof (zero_64),
-									OBJDB_VALUETYPE_UINT64);
+		"closed", &zero_64, sizeof (zero_64),
+		OBJDB_VALUETYPE_UINT64);
 }
 
 
@@ -1370,7 +1369,7 @@ int main (int argc, char **argv)
 		corosync_exit_error (AIS_DONE_MAINCONFIGREAD);
 	}
 
-  	totem_config.totem_logging_configuration.log_level_security = LOGSYS_LEVEL_WARNING;
+	totem_config.totem_logging_configuration.log_level_security = LOGSYS_LEVEL_WARNING;
 	totem_config.totem_logging_configuration.log_level_error = LOGSYS_LEVEL_ERROR;
 	totem_config.totem_logging_configuration.log_level_warning = LOGSYS_LEVEL_WARNING;
 	totem_config.totem_logging_configuration.log_level_notice = LOGSYS_LEVEL_NOTICE;
@@ -1395,8 +1394,8 @@ int main (int argc, char **argv)
 
 	/* create the main runtime object */
 	objdb->object_create (OBJECT_PARENT_HANDLE,
-						  &object_runtime_handle,
-						  "runtime", strlen ("runtime"));
+		&object_runtime_handle,
+		"runtime", strlen ("runtime"));
 
 	/*
 	 * Now we are fully initialized.
@@ -1499,3 +1498,4 @@ int main (int argc, char **argv)
 
 	return EXIT_SUCCESS;
 }
+

exec/objdb.c

@@ -205,9 +205,9 @@ static int _object_notify_deleted_children(struct object_instance *parent_pt)
 			if ((tracker_pt != NULL) &&
 				(tracker_pt->object_destroy_notify_fn != NULL))
 				tracker_pt->object_destroy_notify_fn(parent_pt->object_handle,
-													 obj_pt->object_name,
-													 obj_pt->object_name_len,
-													 tracker_pt->data_pt);
+					obj_pt->object_name,
+					obj_pt->object_name_len,
+					tracker_pt->data_pt);
 		}
 	}
 
@@ -237,9 +237,10 @@ static void object_created_notification(
 			if (((obj_handle == parent_object_handle) ||
 				 (tracker_pt->depth == OBJECT_TRACK_DEPTH_RECURSIVE)) &&
 				(tracker_pt->object_create_notify_fn != NULL)) {
-				tracker_pt->object_create_notify_fn(object_handle, parent_object_handle,
-									 name_pt, name_len,
-									 tracker_pt->data_pt);
+				tracker_pt->object_create_notify_fn(object_handle,
+					parent_object_handle,
+					name_pt, name_len,
+					tracker_pt->data_pt);
 			}
 		}
 
@@ -453,9 +454,9 @@ static int object_create (
 
 	hdb_handle_put (&object_instance_database, parent_object_handle);
 	object_created_notification(object_instance->object_handle,
-								object_instance->parent_handle,
-								object_instance->object_name,
-								object_instance->object_name_len);
+		object_instance->parent_handle,
+		object_instance->object_name,
+		object_instance->object_name_len);
 	objdb_rdunlock();
 	return (0);
 
@@ -525,34 +526,34 @@ static int object_key_create_typed(
 	}
 
 	switch (value_type) {
-		case OBJDB_VALUETYPE_INT16:
-			expected_size = sizeof (int16_t);
-			break;
-		case OBJDB_VALUETYPE_UINT16:
-			expected_size = sizeof (uint16_t);
-			break;
-		case OBJDB_VALUETYPE_INT32:
-			expected_size = sizeof (int32_t);
-			break;
-		case OBJDB_VALUETYPE_UINT32:
-			expected_size = sizeof (uint32_t);
-			break;
-		case OBJDB_VALUETYPE_INT64:
-			expected_size = sizeof (int64_t);
-			break;
-		case OBJDB_VALUETYPE_UINT64:
-			expected_size = sizeof (uint64_t);
-			break;
-		case OBJDB_VALUETYPE_FLOAT:
-			expected_size = sizeof (float);
-			break;
-		case OBJDB_VALUETYPE_DOUBLE:
-			expected_size = sizeof (double);
-			break;
-		case OBJDB_VALUETYPE_ANY:
-		default:
-			test_size_by_type = CS_FALSE;
-			break;
+	case OBJDB_VALUETYPE_INT16:
+		expected_size = sizeof (int16_t);
+		break;
+	case OBJDB_VALUETYPE_UINT16:
+		expected_size = sizeof (uint16_t);
+		break;
+	case OBJDB_VALUETYPE_INT32:
+		expected_size = sizeof (int32_t);
+		break;
+	case OBJDB_VALUETYPE_UINT32:
+		expected_size = sizeof (uint32_t);
+		break;
+	case OBJDB_VALUETYPE_INT64:
+		expected_size = sizeof (int64_t);
+		break;
+	case OBJDB_VALUETYPE_UINT64:
+		expected_size = sizeof (uint64_t);
+		break;
+	case OBJDB_VALUETYPE_FLOAT:
+		expected_size = sizeof (float);
+		break;
+	case OBJDB_VALUETYPE_DOUBLE:
+		expected_size = sizeof (double);
+		break;
+	case OBJDB_VALUETYPE_ANY:
+	default:
+		test_size_by_type = CS_FALSE;
+		break;
 	}
 	if (test_size_by_type) {
 		if (expected_size != value_len) {
@@ -634,7 +635,7 @@ static int object_key_create_typed(
 	object_key->value_type = value_type;
 
 	object_key_changed_notification(object_handle, key_name, key_len,
-					value, value_len, OBJECT_KEY_CREATED);
+		value, value_len, OBJECT_KEY_CREATED);
 	hdb_handle_put (&object_instance_database, object_handle);
 	objdb_rdunlock();
 	return (0);
@@ -672,7 +673,7 @@ static int object_key_create (
 	}
 
 	ret = object_key_create_typed (object_handle, key_name_str,
-					value, value_len, OBJDB_VALUETYPE_ANY);
+		value, value_len, OBJDB_VALUETYPE_ANY);
 	if (key_name_terminated) {
 		free (key_name_terminated);
 	}
@@ -1217,9 +1218,10 @@ static int object_key_delete (
 	}
 
 	hdb_handle_put (&object_instance_database, object_handle);
-	if (ret == 0)
+	if (ret == 0) {
 		object_key_changed_notification(object_handle, key_name, key_len,
-										NULL, 0, OBJECT_KEY_DELETED);
+			NULL, 0, OBJECT_KEY_DELETED);
+	}
 	objdb_rdunlock();
 	return (ret);
 
@@ -1314,9 +1316,10 @@ static int object_key_replace (
 	}
 
 	hdb_handle_put (&object_instance_database, object_handle);
-	if (ret == 0)
-		object_key_changed_notification(object_handle, key_name, key_len,
-										new_value, new_value_len, OBJECT_KEY_REPLACED);
+	if (ret == 0) {
+		object_key_changed_notification (object_handle, key_name, key_len,
+			new_value, new_value_len, OBJECT_KEY_REPLACED);
+	}
 	objdb_rdunlock();
 	return (ret);
 
@@ -1380,38 +1383,37 @@ static int _dump_object(struct object_instance *instance, FILE *file, int depth)
 		memcpy(stringbuf1, object_key->key_name, object_key->key_len);
 		stringbuf1[object_key->key_len] = '\0';
 
-
 		switch (object_key->value_type) {
-			case OBJDB_VALUETYPE_INT16:
-				snprintf (stringbuf2, sizeof(int), "%hd",
-						  *(unsigned int*)object_key->value);
-				break;
-			case OBJDB_VALUETYPE_UINT16:
-				snprintf (stringbuf2, sizeof(int), "%hu",
-						  *(unsigned int*)object_key->value);
-				break;
-			case OBJDB_VALUETYPE_INT32:
-				snprintf (stringbuf2, sizeof(int), "%d",
-						  *(int*)object_key->value);
-				break;
-			case OBJDB_VALUETYPE_UINT32:
-				snprintf (stringbuf2, sizeof(int), "%u",
-						  *(unsigned int*)object_key->value);
-				break;
-			case OBJDB_VALUETYPE_INT64:
-				snprintf (stringbuf2, sizeof(int), "%ld",
-						  *(long int*)object_key->value);
-				break;
-			case OBJDB_VALUETYPE_UINT64:
-				snprintf (stringbuf2, sizeof(int), "%lu",
-						  *(unsigned long int*)object_key->value);
-				break;
-			default:
-			case OBJDB_VALUETYPE_STRING:
-			case OBJDB_VALUETYPE_ANY:
-				memcpy(stringbuf2, object_key->value, object_key->value_len);
-				stringbuf2[object_key->value_len] = '\0';
-				break;
+		case OBJDB_VALUETYPE_INT16:
+			snprintf (stringbuf2, sizeof(int), "%hd",
+				*(unsigned int*)object_key->value);
+			break;
+		case OBJDB_VALUETYPE_UINT16:
+			snprintf (stringbuf2, sizeof(int), "%hu",
+				*(unsigned int*)object_key->value);
+			break;
+		case OBJDB_VALUETYPE_INT32:
+			snprintf (stringbuf2, sizeof(int), "%d",
+				*(int*)object_key->value);
+			break;
+		case OBJDB_VALUETYPE_UINT32:
+			snprintf (stringbuf2, sizeof(int), "%u",
+				*(unsigned int*)object_key->value);
+			break;
+		case OBJDB_VALUETYPE_INT64:
+			snprintf (stringbuf2, sizeof(int), "%ld",
+				*(long int*)object_key->value);
+			break;
+		case OBJDB_VALUETYPE_UINT64:
+			snprintf (stringbuf2, sizeof(int), "%lu",
+				*(unsigned long int*)object_key->value);
+			break;
+		default:
+		case OBJDB_VALUETYPE_STRING:
+		case OBJDB_VALUETYPE_ANY:
+			memcpy(stringbuf2, object_key->value, object_key->value_len);
+			stringbuf2[object_key->value_len] = '\0';
+			break;
 		}
 
 		for (i=0; i<depth+1; i++)
@@ -1462,10 +1464,10 @@ error_exit:
 }
 
 static int object_key_iter_typed (hdb_handle_t parent_object_handle,
-			   char **key_name,
-			   void **value,
-			   size_t *value_len,
-			   objdb_value_types_t *type)
+	char **key_name,
+	void **value,
+	size_t *value_len,
+	objdb_value_types_t *type)
 {
 	unsigned int res;
 	struct object_instance *instance;
@@ -1517,7 +1519,8 @@ static int object_key_iter(hdb_handle_t parent_object_handle,
 	objdb_value_types_t t;
 	int ret;
 	char *str;
-	ret = object_key_iter_typed (parent_object_handle, (char**)key_name, value, value_len, &t);
+	ret = object_key_iter_typed (parent_object_handle,
+		(char**)key_name, value, value_len, &t);
 	str = *key_name;
 	*key_len = strlen(str);
 	return ret;
@@ -1853,3 +1856,4 @@ __attribute__ ((constructor)) static void corosync_lcr_component_register (void)
 
 	lcr_component_register (&objdb_comp_ver0);
 }
+

exec/totemsrp.c

@@ -140,10 +140,10 @@
 #define ENDIAN_LOCAL					 0xff22
 
 enum message_type {
-	MESSAGE_TYPE_ORF_TOKEN = 0,		/* Ordering, Reliability, Flow (ORF) control Token */
-	MESSAGE_TYPE_MCAST = 1,			/* ring ordered multicast message */
+	MESSAGE_TYPE_ORF_TOKEN = 0,			/* Ordering, Reliability, Flow (ORF) control Token */
+	MESSAGE_TYPE_MCAST = 1,				/* ring ordered multicast message */
 	MESSAGE_TYPE_MEMB_MERGE_DETECT = 2,	/* merge rings if there are available rings */
-	MESSAGE_TYPE_MEMB_JOIN = 3, 		/* membership join message */
+	MESSAGE_TYPE_MEMB_JOIN = 3,			/* membership join message */
 	MESSAGE_TYPE_MEMB_COMMIT_TOKEN = 4,	/* membership commit token */
 	MESSAGE_TYPE_TOKEN_HOLD_CANCEL = 5,	/* cancel the holding of the token */
 };
@@ -268,7 +268,7 @@ struct memb_commit_token {
 /*
  * These parts of the data structure are dynamic:
  *
- * 	struct srp_addr addr[PROCESSOR_COUNT_MAX];
+ *	struct srp_addr addr[PROCESSOR_COUNT_MAX];
  *	struct memb_commit_token_memb_entry memb_list[PROCESSOR_COUNT_MAX];
  */
 }__attribute__((packed));
@@ -903,7 +903,7 @@ int totemsrp_initialize (
 		}
 		else {
 			log_printf (instance->totemsrp_log_level_debug,
-                		"total heartbeat_timeout (%d ms)\n", instance->heartbeat_timeout);
+				"total heartbeat_timeout (%d ms)\n", instance->heartbeat_timeout);
 		}
 	}
 
@@ -926,17 +926,17 @@ int totemsrp_initialize (
 		sizeof (struct message_item));
 
 	totemsrp_callback_token_create (instance,
-									&instance->token_recv_event_handle,
-									TOTEM_CALLBACK_TOKEN_RECEIVED,
-									0,
-									token_event_stats_collector,
-									instance);
+		&instance->token_recv_event_handle,
+		TOTEM_CALLBACK_TOKEN_RECEIVED,
+		0,
+		token_event_stats_collector,
+		instance);
 	totemsrp_callback_token_create (instance,
-									&instance->token_sent_event_handle,
-									TOTEM_CALLBACK_TOKEN_SENT,
-									0,
-									token_event_stats_collector,
-									instance);
+		&instance->token_sent_event_handle,
+		TOTEM_CALLBACK_TOKEN_SENT,
+		0,
+		token_event_stats_collector,
+		instance);
 	*srp_context = instance;
 	return (0);