Commit 8dd1cd21 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

check_format: For C files only, fix return type breaks 



In SPDK, declarations have the return type on the same line. Definitions
have the return type on a separate line. Astyle has an option for
enforcing this. Unfortunately, it seems to have two bugs:

1) It doesn't work correctly at all on C++ files.
2) It often fails on functions that return enums, or long type names

Deal with 1) by adjusting the check_format.sh script to only tell astyle
to fix return type line breaks for C files and not C++. Deal with 2) by
adding a few typedefs to work around the problem.

Change-Id: Idf28281466cab8411ce252d5f02ab384166790c6
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13437


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 8620c9a0

app/iscsi_top/iscsi_top.c

+4 −2
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ static int g_shm_id = 0; 


struct spdk_jsonrpc_client *g_rpc_client;



static void usage(void)

static void

usage(void)

{

	fprintf(stderr, "usage:\n");

	fprintf(stderr, "   %s <option>\n", exe_name);
@@ -107,7 +108,8 @@ end: 
	spdk_jsonrpc_client_free_request(request);

}



int main(int argc, char **argv)

int

main(int argc, char **argv)

{

	void			*history_ptr;

	struct spdk_trace_histories *histories;

app/spdk_dd/spdk_dd.c

+2 −1
Original line number Diff line number Diff line
@@ -677,7 +677,8 @@ dd_open_bdev(struct dd_target *target, const char *bdev_name, uint64_t skip_bloc 
	return 0;

}



static void dd_finish(void)

static void

dd_finish(void)

{

	/* Interrupt operation */

	g_interrupt = true;

app/spdk_top/spdk_top.c

+2 −1
Original line number Diff line number Diff line
@@ -3239,7 +3239,8 @@ wait_init(pthread_t *data_thread) 
	return 0;

}



int main(int argc, char **argv)

int

main(int argc, char **argv)

{

	int op, rc;

	char *socket = SPDK_DEFAULT_RPC_ADDR;

app/trace/trace.cpp

+4 −2
Original line number Diff line number Diff line
@@ -318,7 +318,8 @@ print_json(void *cb_ctx, const void *data, size_t size) 
	return 0;

}



static void usage(void)

static void

usage(void)

{

	fprintf(stderr, "usage:\n");

	fprintf(stderr, "   %s <option> <lcore#>\n", g_exe_name);
@@ -335,7 +336,8 @@ static void usage(void) 
	fprintf(stderr, "                 '-j' to use JSON to format the output\n");

}



int main(int argc, char **argv)

int

main(int argc, char **argv)

{

	struct spdk_trace_parser_opts	opts;

	struct spdk_trace_parser_entry	entry;

app/trace_record/trace_record.c

+4 −2
Original line number Diff line number Diff line
@@ -538,7 +538,8 @@ setup_exit_signal_handler(void) 
	return rc;

}



static void usage(void)

static void

usage(void)

{

	printf("\n%s is used to record all SPDK generated trace entries\n", g_exe_name);

	printf("from SPDK trace shared-memory to specified file.\n\n");
@@ -554,7 +555,8 @@ static void usage(void) 
	printf("                 '-h' to print usage information\n");

}



int main(int argc, char **argv)

int

main(int argc, char **argv)

{

	const char			*app_name = NULL;

	const char			*file_name = NULL;