From 4f4d0ab6c17612ea1e420ffb31f3fa3c12b9fbad Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 28 Feb 2020 01:20:06 -0500 Subject: [PATCH] lib/iscsi: Remove workaround for astyle format check about break-after-return-type To avoid the strange formatting, typedef has been used. But this comment is hard to get the meaning. So stop breaking after return type for this case. Signed-off-by: Shuhei Matsumoto Change-Id: I317604de67aab9f201d691e0f886bd673f451f3f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1051 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Tomasz Zawadzki --- lib/iscsi/tgt_node.c | 15 +++++++-------- lib/iscsi/tgt_node.h | 20 +++++++------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 4e8d5578c..1d2510038 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -917,14 +917,13 @@ spdk_iscsi_check_chap_params(bool disable, bool require, bool mutual, int group) return false; } -_spdk_iscsi_tgt_node * -spdk_iscsi_tgt_node_construct(int target_index, - const char *name, const char *alias, - int *pg_tag_list, int *ig_tag_list, uint16_t num_maps, - const char *bdev_name_list[], int *lun_id_list, int num_luns, - int queue_depth, - bool disable_chap, bool require_chap, bool mutual_chap, int chap_group, - bool header_digest, bool data_digest) +struct spdk_iscsi_tgt_node *spdk_iscsi_tgt_node_construct(int target_index, + const char *name, const char *alias, + int *pg_tag_list, int *ig_tag_list, uint16_t num_maps, + const char *bdev_name_list[], int *lun_id_list, int num_luns, + int queue_depth, + bool disable_chap, bool require_chap, bool mutual_chap, int chap_group, + bool header_digest, bool data_digest) { char fullname[MAX_TMPBUF]; struct spdk_iscsi_tgt_node *target; diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h index 9d8f90667..c716d1d5c 100644 --- a/lib/iscsi/tgt_node.h +++ b/lib/iscsi/tgt_node.h @@ -105,25 +105,19 @@ int spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, int data_len); -/* This typedef exists to work around an astyle 2.05 bug. - * Remove it when astyle is fixed. - */ -typedef struct spdk_iscsi_tgt_node _spdk_iscsi_tgt_node; - /* * bdev_name_list and lun_id_list are equal sized arrays of size num_luns. * bdev_name_list refers to the names of the bdevs that will be used for the LUNs on the * new target node. * lun_id_list refers to the LUN IDs that will be used for the LUNs on the target node. */ -_spdk_iscsi_tgt_node * -spdk_iscsi_tgt_node_construct(int target_index, - const char *name, const char *alias, - int *pg_tag_list, int *ig_tag_list, uint16_t num_maps, - const char *bdev_name_list[], int *lun_id_list, int num_luns, - int queue_depth, - bool disable_chap, bool require_chap, bool mutual_chap, int chap_group, - bool header_digest, bool data_digest); +struct spdk_iscsi_tgt_node *spdk_iscsi_tgt_node_construct(int target_index, + const char *name, const char *alias, + int *pg_tag_list, int *ig_tag_list, uint16_t num_maps, + const char *bdev_name_list[], int *lun_id_list, int num_luns, + int queue_depth, + bool disable_chap, bool require_chap, bool mutual_chap, int chap_group, + bool header_digest, bool data_digest); bool spdk_iscsi_check_chap_params(bool disable, bool require, bool mutual, int group);