Fix style problems about "foo*" -"foo* bar" should be "foo *bar". -"foo* const bar" should be "foo * const bar". -"(foo*)" should be "(foo *)"
Signed-off-by: Zhang Han <zhangha...@huawei.com> --- net/slirp.c | 2 +- net/tap-win32.c | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index 61a9e3071e..772b3c35f2 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -809,7 +809,7 @@ static void slirp_smb_cleanup(SlirpState *s) } } -static int slirp_smb(SlirpState* s, const char *exported_dir, +static int slirp_smb(SlirpState *s, const char *exported_dir, struct in_addr vserver_addr, Error **errp) { char *smb_conf; diff --git a/net/tap-win32.c b/net/tap-win32.c index 0f0d95cdbb..ac139e9ec9 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -101,7 +101,7 @@ typedef struct tun_buffer_s { unsigned char buffer[TUN_BUFFER_SIZE]; unsigned long read_size; - struct tun_buffer_s* next; + struct tun_buffer_s *next; } tun_buffer_t; typedef struct tap_win32_overlapped { @@ -116,16 +116,16 @@ typedef struct tap_win32_overlapped { OVERLAPPED read_overlapped; OVERLAPPED write_overlapped; tun_buffer_t buffers[TUN_MAX_BUFFER_COUNT]; - tun_buffer_t* free_list; - tun_buffer_t* output_queue_front; - tun_buffer_t* output_queue_back; + tun_buffer_t *free_list; + tun_buffer_t *output_queue_front; + tun_buffer_t *output_queue_back; } tap_win32_overlapped_t; static tap_win32_overlapped_t tap_overlapped; -static tun_buffer_t* get_buffer_from_free_list(tap_win32_overlapped_t* const overlapped) +static tun_buffer_t *get_buffer_from_free_list(tap_win32_overlapped_t *const overlapped) { - tun_buffer_t* buffer = NULL; + tun_buffer_t *buffer = NULL; WaitForSingleObject(overlapped->free_list_semaphore, INFINITE); EnterCriticalSection(&overlapped->free_list_cs); buffer = overlapped->free_list; @@ -136,7 +136,7 @@ static tun_buffer_t* get_buffer_from_free_list(tap_win32_overlapped_t* const ove return buffer; } -static void put_buffer_on_free_list(tap_win32_overlapped_t* const overlapped, tun_buffer_t* const buffer) +static void put_buffer_on_free_list(tap_win32_overlapped_t *const overlapped, tun_buffer_t *const buffer) { EnterCriticalSection(&overlapped->free_list_cs); buffer->next = overlapped->free_list; @@ -145,9 +145,9 @@ static void put_buffer_on_free_list(tap_win32_overlapped_t* const overlapped, tu ReleaseSemaphore(overlapped->free_list_semaphore, 1, NULL); } -static tun_buffer_t* get_buffer_from_output_queue(tap_win32_overlapped_t* const overlapped, const int block) +static tun_buffer_t *get_buffer_from_output_queue(tap_win32_overlapped_t *const overlapped, const int block) { - tun_buffer_t* buffer = NULL; + tun_buffer_t *buffer = NULL; DWORD result, timeout = block ? INFINITE : 0L; /* Non-blocking call */ @@ -177,12 +177,12 @@ static tun_buffer_t* get_buffer_from_output_queue(tap_win32_overlapped_t* const return buffer; } -static tun_buffer_t* get_buffer_from_output_queue_immediate(tap_win32_overlapped_t* const overlapped) +static tun_buffer_t *get_buffer_from_output_queue_immediate(tap_win32_overlapped_t *const overlapped) { return get_buffer_from_output_queue(overlapped, 0); } -static void put_buffer_on_output_queue(tap_win32_overlapped_t* const overlapped, tun_buffer_t* const buffer) +static void put_buffer_on_output_queue(tap_win32_overlapped_t *const overlapped, tun_buffer_t *const buffer) { EnterCriticalSection(&overlapped->output_queue_cs); @@ -409,7 +409,7 @@ static int tap_win32_set_status(HANDLE handle, int status) &status, sizeof(status), &len, NULL); } -static void tap_win32_overlapped_init(tap_win32_overlapped_t* const overlapped, const HANDLE handle) +static void tap_win32_overlapped_init(tap_win32_overlapped_t *const overlapped, const HANDLE handle) { overlapped->handle = handle; @@ -452,7 +452,7 @@ static void tap_win32_overlapped_init(tap_win32_overlapped_t* const overlapped, { unsigned index; for (index = 0; index < TUN_MAX_BUFFER_COUNT; index++) { - tun_buffer_t* element = &overlapped->buffers[index]; + tun_buffer_t *element = &overlapped->buffers[index]; element->next = overlapped->free_list; overlapped->free_list = element; } @@ -520,11 +520,11 @@ static int tap_win32_write(tap_win32_overlapped_t *overlapped, static DWORD WINAPI tap_win32_thread_entry(LPVOID param) { - tap_win32_overlapped_t *overlapped = (tap_win32_overlapped_t*)param; + tap_win32_overlapped_t *overlapped = (tap_win32_overlapped_t *)param; unsigned long read_size; BOOL result; DWORD dwError; - tun_buffer_t* buffer = get_buffer_from_free_list(overlapped); + tun_buffer_t *buffer = get_buffer_from_free_list(overlapped); for (;;) { @@ -578,7 +578,7 @@ static int tap_win32_read(tap_win32_overlapped_t *overlapped, { int size = 0; - tun_buffer_t* buffer = get_buffer_from_output_queue_immediate(overlapped); + tun_buffer_t *buffer = get_buffer_from_output_queue_immediate(overlapped); if (buffer != NULL) { *pbuf = buffer->buffer; @@ -594,7 +594,7 @@ static int tap_win32_read(tap_win32_overlapped_t *overlapped, static void tap_win32_free_buffer(tap_win32_overlapped_t *overlapped, uint8_t *pbuf) { - tun_buffer_t* buffer = (tun_buffer_t*)pbuf; + tun_buffer_t *buffer = (tun_buffer_t *)pbuf; put_buffer_on_free_list(overlapped, buffer); } -- 2.29.1.59.gf9b6481aed