summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2013-11-22 09:44:28 +0100
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2013-11-22 10:14:27 +0100
commitce4ac96276d480cdb61f0771c11a7637622458b4 (patch)
tree4b8591d51d4b7a3034a91770b07e634389423572 /src
parent082293c5df0c99970e28330492cc4d30b0c629c8 (diff)
downloadcmumble-ce4ac96276d480cdb61f0771c11a7637622458b4.tar.gz
cmumble-ce4ac96276d480cdb61f0771c11a7637622458b4.tar.bz2
cmumble-ce4ac96276d480cdb61f0771c11a7637622458b4.zip
Coding style fixes
* remove trailing whitespace * inline where fit for 80 columns
Diffstat (limited to 'src')
-rw-r--r--src/cmumble.c2
-rw-r--r--src/commands.c2
-rw-r--r--src/connection.c6
-rw-r--r--src/io.c4
-rw-r--r--src/message.c2
5 files changed, 7 insertions, 9 deletions
diff --git a/src/cmumble.c b/src/cmumble.c
index 6c11550..c1f6a92 100644
--- a/src/cmumble.c
+++ b/src/cmumble.c
@@ -94,7 +94,7 @@ recv_channel_state(MumbleProto__ChannelState *state,
channel->parent = state->parent;
if (state->description)
channel->description = g_strdup(state->description);
-
+
channel->temporary = state->temporary;
channel->position = state->position;
}
diff --git a/src/commands.c b/src/commands.c
index 83bc3f0..2db480d 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -170,7 +170,7 @@ complete(const char *in, int n)
if (strncmp(name, in, len) == 0)
return g_strdup(name);
}
-
+
return NULL;
}
diff --git a/src/connection.c b/src/connection.c
index 05a62b7..6e2cc98 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -64,10 +64,8 @@ cmumble_connection_init(struct cmumble *cm,
g_socket_client_set_tls_validation_flags(con->sock_client,
G_TLS_CERTIFICATE_INSECURE);
g_socket_client_set_family(con->sock_client, G_SOCKET_FAMILY_IPV4);
- g_socket_client_set_protocol(con->sock_client,
- G_SOCKET_PROTOCOL_TCP);
- g_socket_client_set_socket_type(con->sock_client,
- G_SOCKET_TYPE_STREAM);
+ g_socket_client_set_protocol(con->sock_client, G_SOCKET_PROTOCOL_TCP);
+ g_socket_client_set_socket_type(con->sock_client, G_SOCKET_TYPE_STREAM);
g_socket_client_connect_to_host_async(con->sock_client,
host, port, NULL,
diff --git a/src/io.c b/src/io.c
index c915202..379e48f 100644
--- a/src/io.c
+++ b/src/io.c
@@ -67,7 +67,7 @@ static char *
skip_whitespace(char *text)
{
int i;
-
+
for (i = 0; text[i] != '\0'; ++i) {
if (text[i] != ' ')
return &text[i];
@@ -92,7 +92,7 @@ static char *
skip_non_whitespace(char *text, char delimiter)
{
int i;
-
+
for (i = 0; text[i] != '\0'; ++i) {
if (text[i] == delimiter && !is_escaped(text, i, '\\'))
return &text[i];
diff --git a/src/message.c b/src/message.c
index 01160c9..59f9718 100644
--- a/src/message.c
+++ b/src/message.c
@@ -23,7 +23,7 @@ add_preamble(uint8_t *buffer, uint16_t type, uint32_t len)
buffer[5] = (len) & 0xff;
buffer[4] = (len >> 8) & 0xff;
buffer[3] = (len >> 16) & 0xff;
- buffer[2] = (len >> 24) & 0xff;
+ buffer[2] = (len >> 24) & 0xff;
}
static void