From e16868dede6455cab644805af6fe1ac312775e13 Mon Sep 17 00:00:00 2001 From: Gluster Ant Date: Wed, 12 Sep 2018 17:52:45 +0530 Subject: Land part 2 of clang-format changes Change-Id: Ia84cc24c8924e6d22d02ac15f611c10e26db99b4 Signed-off-by: Nigel Babu --- extras/create_new_xlator/new-xlator-tmpl.c | 141 +++++++++++++---------------- 1 file changed, 64 insertions(+), 77 deletions(-) (limited to 'extras/create_new_xlator') diff --git a/extras/create_new_xlator/new-xlator-tmpl.c b/extras/create_new_xlator/new-xlator-tmpl.c index 474144c1c81..caa10b374d1 100644 --- a/extras/create_new_xlator/new-xlator-tmpl.c +++ b/extras/create_new_xlator/new-xlator-tmpl.c @@ -1,37 +1,32 @@ #pragma fragment CBK_TEMPLATE -int32_t -@FOP_PREFIX@_@NAME@_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, @UNWIND_PARAMS@) +int32_t @FOP_PREFIX @_ @NAME + @_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, + int32_t op_errno, @UNWIND_PARAMS @) { - STACK_UNWIND_STRICT (@NAME@, frame, op_ret, op_errno, - @UNWIND_ARGS@); - return 0; + STACK_UNWIND_STRICT(@NAME @, frame, op_ret, op_errno, @UNWIND_ARGS @); + return 0; } #pragma fragment COMMENT -If you are generating the leaf xlators, remove the STACK_WIND -and replace the @ERROR_ARGS@ to @UNWIND_ARGS@ if necessary +If you are generating the leaf xlators, remove the STACK_WIND and replace the + @ERROR_ARGS @to @UNWIND_ARGS @ if necessary #pragma fragment FOP_TEMPLATE -int32_t -@FOP_PREFIX@_@NAME@ (call_frame_t *frame, xlator_t *this, - @WIND_PARAMS@) + int32_t @FOP_PREFIX @_ @NAME + @(call_frame_t *frame, xlator_t *this, @WIND_PARAMS @) { - STACK_WIND (frame, @FOP_PREFIX@_@NAME@_cbk, - FIRST_CHILD(this), FIRST_CHILD(this)->fops->@NAME@, - @WIND_ARGS@); - return 0; + STACK_WIND(frame, @FOP_PREFIX @_ @NAME @_cbk, FIRST_CHILD(this), + FIRST_CHILD(this)->fops->@NAME @, @WIND_ARGS @); + return 0; err: - STACK_UNWIND_STRICT (@NAME@, frame, -1, errno, - @ERROR_ARGS@); - return 0; + STACK_UNWIND_STRICT(@NAME @, frame, -1, errno, @ERROR_ARGS @); + return 0; } #pragma fragment FUNC_TEMPLATE -@RET_TYPE@ -@FOP_PREFIX@_@NAME@ (@FUNC_PARAMS@) +@RET_TYPE @ @FOP_PREFIX @_ @NAME @(@FUNC_PARAMS @) { - return @RET_VAR@; + return @RET_VAR @; } #pragma fragment CP @@ -50,77 +45,71 @@ err: #pragma fragment XLATOR_METHODS -static int32_t -@FOP_PREFIX@_init (xlator_t *this) +static int32_t @FOP_PREFIX @_init(xlator_t *this) { - return 0; + return 0; } -static void -@FOP_PREFIX@_fini (xlator_t *this) +static void @FOP_PREFIX @_fini(xlator_t *this) { - return; + return; } -static int32_t -@FOP_PREFIX@_reconfigure (xlator_t *this, dict_t *dict) +static int32_t @FOP_PREFIX @_reconfigure(xlator_t *this, dict_t *dict) { - return 0; + return 0; } -static int -@FOP_PREFIX@_notify (xlator_t *this, int event, void *data, ...) +static int @FOP_PREFIX @_notify(xlator_t *this, int event, void *data, ...) { - return default_notify (this, event, data); + return default_notify(this, event, data); } -static int32_t -@FOP_PREFIX@_mem_acct_init (xlator_t *this) +static int32_t @FOP_PREFIX @_mem_acct_init(xlator_t *this) { - int ret = -1; + int ret = -1; - ret = xlator_mem_acct_init (this, gf_@FOP_PREFIX@_mt_end + 1); - return ret; + ret = xlator_mem_acct_init(this, gf_ @FOP_PREFIX @_mt_end + 1); + return ret; } -static int32_t -@FOP_PREFIX@_dump_metrics (xlator_t *this, int fd) +static int32_t @FOP_PREFIX @_dump_metrics(xlator_t *this, int fd) { - return 0; + return 0; } -struct volume_options @FOP_PREFIX@_options[] = { - /*{ .key = {""}, - .type = GF_OPTION_TYPE_BOOL, - .default_value = "", - .op_version = {GD_OP_VERSION_}, - .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT, - .tags = {""}, - .description = "", - .category = GF_EXPERIMENTAL, - }, - { .key = {NULL} }, - */ +struct volume_options @FOP_PREFIX @_options[] = { + /*{ .key = {""}, + .type = GF_OPTION_TYPE_BOOL, + .default_value = "", + .op_version = {GD_OP_VERSION_}, + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC | OPT_FLAG_CLIENT_OPT, + .tags = {""}, + .description = "", + .category = GF_EXPERIMENTAL, + }, + { .key = {NULL} }, + */ }; xlator_api_t xlator_api = { - .init = @FOP_PREFIX@_init, - .fini = @FOP_PREFIX@_fini, - .notify = @FOP_PREFIX@_notify, - .reconfigure = @FOP_PREFIX@_reconfigure, - .mem_acct_init = @FOP_PREFIX@_mem_acct_init, - .dump_metrics = @FOP_PREFIX@_dump_metrics, - .op_version = {GD_OP_VERSION_}, - .dumpops = &@FOP_PREFIX@_dumpops, - .fops = &@FOP_PREFIX@_fops, - .cbks = &@FOP_PREFIX@_cbks, - .options = @FOP_PREFIX@_options, - .identifier = "@XL_NAME@", - .category = GF_EXPERIMENTAL, + .init = @FOP_PREFIX @_init, + .fini = @FOP_PREFIX @_fini, + .notify = @FOP_PREFIX @_notify, + .reconfigure = @FOP_PREFIX @_reconfigure, + .mem_acct_init = @FOP_PREFIX @_mem_acct_init, + .dump_metrics = @FOP_PREFIX @_dump_metrics, + .op_version = {GD_OP_VERSION_}, + .dumpops = &@FOP_PREFIX @_dumpops, + .fops = &@FOP_PREFIX @_fops, + .cbks = &@FOP_PREFIX @_cbks, + .options = @FOP_PREFIX @_options, + .identifier = "@XL_NAME@", + .category = GF_EXPERIMENTAL, }; #pragma fragment HEADER_FMT -#ifndef __@HFL_NAME@_H__ -#define __@HFL_NAME@_H__ +#ifndef __ @HFL_NAME @_H__ +#define __ @HFL_NAME @_H__ #include "@XL_NAME@-mem-types.h" #include "@XL_NAME@-messages.h" @@ -131,21 +120,21 @@ xlator_api_t xlator_api = { #endif /* __@HFL_NAME@_H__ */ #pragma fragment MEM_HEADER_FMT -#ifndef __@HFL_NAME@_H__ -#define __@HFL_NAME@_H__ +#ifndef __ @HFL_NAME @_H__ +#define __ @HFL_NAME @_H__ #include "mem-types.h" enum gf_mdc_mem_types_ { - gf_@FOP_PREFIX@_mt_ = gf_common_mt_end + 1, - gf_@FOP_PREFIX@_mt_end + gf_ @FOP_PREFIX @_mt_ = gf_common_mt_end + 1, + gf_ @FOP_PREFIX @_mt_end }; #endif /* __@HFL_NAME@_H__ */ #pragma fragment MSG_HEADER_FMT -#ifndef __@HFL_NAME@_H__ -#define __@HFL_NAME@_H__ +#ifndef __ @HFL_NAME @_H__ +#define __ @HFL_NAME @_H__ #include "glfs-message-id.h" @@ -159,8 +148,6 @@ enum gf_mdc_mem_types_ { * glfs-message-id.h. */ -GLFS_MSGID(@FOP_PREFIX@, - @FOP_PREFIX@_MSG_NO_MEMORY -); +GLFS_MSGID(@FOP_PREFIX @, @FOP_PREFIX @_MSG_NO_MEMORY); #endif /* __@HFL_NAME@_H__ */ -- cgit