[PATCH 3/5] socket-test: Fix indentation to follow project code style policy

[Marek Chalupa]

Hi,

I think the indentation already follows project code style. From 
doc/Contributing:

"- indent with tabs, and a tab is always 8 characters wide"

current code is:

^Ichar *val = getenv("XDG_RUNTIME_DIR");$
^Iif (!val)$
^I^Iassert(0 && "set $XDG_RUNTIME_DIR to run this test");$

with your patch applied:

^I^Ichar *val = getenv("XDG_RUNTIME_DIR");$
^I^Iif (!val)$
^I^I^I^Iassert(0 && "set $XDG_RUNTIME_DIR to run this test");$

Don't you have tab width set to 4?

Thanks,
Marek


On 11/19/2015 10:36 AM, Bryce Harrington wrote:
> From: Bryce Harrington <bryce at bryceharrington.org>
>
> Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
> ---
>   tests/socket-test.c | 174 ++++++++++++++++++++++++++--------------------------
>   1 file changed, 87 insertions(+), 87 deletions(-)
>
> diff --git a/tests/socket-test.c b/tests/socket-test.c
> index c53f972..f6db6cf 100644
> --- a/tests/socket-test.c
> +++ b/tests/socket-test.c
> @@ -46,129 +46,129 @@ static const struct sockaddr_un example_sockaddr_un;
>   static const char *
>   require_xdg_runtime_dir(void)
>   {
> -	char *val = getenv("XDG_RUNTIME_DIR");
> -	if (!val)
> -		assert(0 && "set $XDG_RUNTIME_DIR to run this test");
> +		char *val = getenv("XDG_RUNTIME_DIR");
> +		if (!val)
> +				assert(0 && "set $XDG_RUNTIME_DIR to run this test");
>
> -	return val;
> +		return val;
>   }
>
>   TEST(socket_path_overflow_client_connect)
>   {
> -	char path[TOO_LONG];
> -	struct wl_display *d;
> +		char path[TOO_LONG];
> +		struct wl_display *d;
>
> -	require_xdg_runtime_dir();
> +		require_xdg_runtime_dir();
>
> -	memset(path, 'a', sizeof path);
> -	path[sizeof path - 1] = '\0';
> +		memset(path, 'a', sizeof path);
> +		path[sizeof path - 1] = '\0';
>
> -	d = wl_display_connect(path);
> -	assert(d == NULL);
> -	assert(errno == ENAMETOOLONG);
> +		d = wl_display_connect(path);
> +		assert(d == NULL);
> +		assert(errno == ENAMETOOLONG);
>   }
>
>   TEST(socket_path_overflow_server_create)
>   {
> -	char path[TOO_LONG];
> -	struct wl_display *d;
> -	int ret;
> +		char path[TOO_LONG];
> +		struct wl_display *d;
> +		int ret;
>
> -	require_xdg_runtime_dir();
> +		require_xdg_runtime_dir();
>
> -	memset(path, 'a', sizeof path);
> -	path[sizeof path - 1] = '\0';
> +		memset(path, 'a', sizeof path);
> +		path[sizeof path - 1] = '\0';
>
> -	d = wl_display_create();
> -	assert(d != NULL);
> +		d = wl_display_create();
> +		assert(d != NULL);
>
> -	ret = wl_display_add_socket(d, path);
> -	assert(ret < 0);
> -	assert(errno == ENAMETOOLONG);
> +		ret = wl_display_add_socket(d, path);
> +		assert(ret < 0);
> +		assert(errno == ENAMETOOLONG);
>
> -	wl_display_destroy(d);
> +		wl_display_destroy(d);
>   }
>
>   TEST(add_existing_socket)
>   {
> -	char path[sizeof example_sockaddr_un.sun_path];
> -	const char *name = "wayland-test-0";
> -	const char *xdg_runtime_dir;
> -	struct wl_display *d;
> -	int ret;
> -	size_t len;
> -
> -	xdg_runtime_dir = require_xdg_runtime_dir();
> -
> -	d = wl_display_create();
> -	assert(d != NULL);
> -
> -	/* this one should be OK */
> -	ret = wl_display_add_socket(d, name);
> -	assert(ret == 0);
> -
> -	/* this on should fail */
> -	ret = wl_display_add_socket(d, name);
> -	assert(ret < 0);
> -
> -	/* the original socket should still exists,
> -	 * this was a bug introduced in e2c0d47b0c77f18cd90e9c6eabb358c4d89681c8 */
> -	len = snprintf(path, sizeof example_sockaddr_un.sun_path, "%s/%s",
> -		       xdg_runtime_dir, name);
> -	assert(len < sizeof example_sockaddr_un.sun_path
> -	       && "Bug in test. Path too long");
> +		char path[sizeof example_sockaddr_un.sun_path];
> +		const char *name = "wayland-test-0";
> +		const char *xdg_runtime_dir;
> +		struct wl_display *d;
> +		int ret;
> +		size_t len;
> +
> +		xdg_runtime_dir = require_xdg_runtime_dir();
> +
> +		d = wl_display_create();
> +		assert(d != NULL);
> +
> +		/* this one should be OK */
> +		ret = wl_display_add_socket(d, name);
> +		assert(ret == 0);
> +
> +		/* this on should fail */
> +		ret = wl_display_add_socket(d, name);
> +		assert(ret < 0);
> +
> +		/* the original socket should still exists,
> +		 * this was a bug introduced in e2c0d47b0c77f18cd90e9c6eabb358c4d89681c8 */
> +		len = snprintf(path, sizeof example_sockaddr_un.sun_path, "%s/%s",
> +					   xdg_runtime_dir, name);
> +		assert(len < sizeof example_sockaddr_un.sun_path
> +			   && "Bug in test. Path too long");
>
> -	assert(access(path, F_OK) != -1);
> +		assert(access(path, F_OK) != -1);
>
> -	/* still should exists the original socket */
> -	ret = wl_display_add_socket(d, name);
> -	assert(ret < 0);
> +		/* still should exists the original socket */
> +		ret = wl_display_add_socket(d, name);
> +		assert(ret < 0);
>
> -	wl_display_destroy(d);
> +		wl_display_destroy(d);
>   }
>
>   TEST(add_socket_auto)
>   {
> -	/* the number of auto sockets is currently 32 */
> -	const int MAX_SOCKETS = 32;
> +		/* the number of auto sockets is currently 32 */
> +		const int MAX_SOCKETS = 32;
>
> -	char path[sizeof example_sockaddr_un.sun_path];
> -	const char *name;
> -	const char *xdg_runtime_dir;
> -	struct wl_display *d;
> -	int i;
> -	size_t len;
> +		char path[sizeof example_sockaddr_un.sun_path];
> +		const char *name;
> +		const char *xdg_runtime_dir;
> +		struct wl_display *d;
> +		int i;
> +		size_t len;
>
> -	xdg_runtime_dir = require_xdg_runtime_dir();
> +		xdg_runtime_dir = require_xdg_runtime_dir();
>
> -	d = wl_display_create();
> -	assert(d != NULL);
> +		d = wl_display_create();
> +		assert(d != NULL);
>
> -	for (i = 0; i <= MAX_SOCKETS; ++i) {
> -		name = wl_display_add_socket_auto(d);
> -		assert(name != NULL);
> +		for (i = 0; i <= MAX_SOCKETS; ++i) {
> +				name = wl_display_add_socket_auto(d);
> +				assert(name != NULL);
>
> -		len = snprintf(path, sizeof example_sockaddr_un.sun_path,
> -			       "%s/%s", xdg_runtime_dir, name);
> -		assert(len < sizeof example_sockaddr_un.sun_path
> -		       && "Bug in test. Path too long");
> +				len = snprintf(path, sizeof example_sockaddr_un.sun_path,
> +							   "%s/%s", xdg_runtime_dir, name);
> +				assert(len < sizeof example_sockaddr_un.sun_path
> +					   && "Bug in test. Path too long");
>
> -		/* was the socket? */
> -		assert(access(path, F_OK) != -1);
> +				/* was the socket? */
> +				assert(access(path, F_OK) != -1);
>
> -		/* is the name sequential? */
> -		len = snprintf(path, sizeof example_sockaddr_un.sun_path,
> -			       "wayland-%d", i);
> -		assert(strcmp(name, path) == 0);
> -	}
> +				/* is the name sequential? */
> +				len = snprintf(path, sizeof example_sockaddr_un.sun_path,
> +							   "wayland-%d", i);
> +				assert(strcmp(name, path) == 0);
> +		}
>
> -	/* next addition should return NULL */
> -	name = wl_display_add_socket_auto(d);
> -	assert(name == NULL);
> +		/* next addition should return NULL */
> +		name = wl_display_add_socket_auto(d);
> +		assert(name == NULL);
>
> -	/* check if the socket was not deleted the last time */
> -	name = wl_display_add_socket_auto(d);
> -	assert(name == NULL);
> +		/* check if the socket was not deleted the last time */
> +		name = wl_display_add_socket_auto(d);
> +		assert(name == NULL);
>
> -	wl_display_destroy(d);
> +		wl_display_destroy(d);
>   }
>