Skip to content

Commit 1caedfe

Browse files
author
ashuang
committed
fix whitespace
git-svn-id: https://lcm.googlecode.com/svn/trunk@721 989093bb-e83e-0410-a25a-9184cbcad8d0
1 parent 54929a4 commit 1caedfe

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

lcm/lcm_tcpq.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ timestamp_now (void)
6363
return (int64_t) tv.tv_sec * 1000000 + tv.tv_usec;
6464
}
6565

66-
static int
66+
static int
6767
_recv_fully(int fd, void *b, int len)
6868
{
6969
int cnt=0;
@@ -84,7 +84,7 @@ _recv_fully(int fd, void *b, int len)
8484
return cnt;
8585
}
8686

87-
static int
87+
static int
8888
_send_fully(int fd, const void *b, int len)
8989
{
9090
int cnt=0;
@@ -143,21 +143,21 @@ _connect_to_server(lcm_tcpq_t *self)
143143
if(self->socket)
144144
_close_socket(self->socket);
145145

146-
self->socket=socket(AF_INET,SOCK_STREAM,0);
146+
self->socket=socket(AF_INET,SOCK_STREAM,0);
147147
if(self->socket < 0) {
148148
perror("lcm_tcpq socket");
149149
return -1;
150150
}
151151

152-
struct sockaddr_in sa;
152+
struct sockaddr_in sa;
153153
sa.sin_family = AF_INET;
154-
sa.sin_port=self->server_port;
155-
sa.sin_addr=self->server_addr;
154+
sa.sin_port=self->server_port;
155+
sa.sin_addr=self->server_addr;
156156

157-
if(0 != connect(self->socket, (struct sockaddr *)&sa, sizeof(sa))) {
157+
if(0 != connect(self->socket, (struct sockaddr *)&sa, sizeof(sa))) {
158158
perror("lcm_tcpq connect");
159159
goto fail;
160-
}
160+
}
161161

162162
if(_send_uint32(self->socket, MAGIC_CLIENT) ||
163163
_send_uint32(self->socket, PROTOCOL_VERSION)) {
@@ -224,8 +224,8 @@ lcm_tcpq_create(lcm_t * parent, const char *network, const GHashTable *args)
224224
// DNS lookup
225225
struct hostent *host=gethostbyname(self->server_addr_str);
226226
if(!host) {
227-
fprintf(stderr,
228-
"LCM tcpq: Couldn't resolve server IP address \"%s\"\n",
227+
fprintf(stderr,
228+
"LCM tcpq: Couldn't resolve server IP address \"%s\"\n",
229229
self->server_addr_str);
230230
g_strfreev (words);
231231
lcm_tcpq_destroy(self);
@@ -262,17 +262,17 @@ lcm_tcpq_get_fileno(lcm_tcpq_t *self)
262262
}
263263

264264
static int
265-
_sub_unsub_helper(lcm_tcpq_t *self, const char *channel, uint32_t msg_type)
265+
_sub_unsub_helper(lcm_tcpq_t *self, const char *channel, uint32_t msg_type)
266266
{
267267
if(self->socket < 0) {
268268
fprintf(stderr, "LCM not connected (%d)\n", self->socket);
269269
return -1;
270270
}
271-
271+
272272
uint32_t channel_len = strlen(channel);
273-
if(_send_uint32(self->socket, msg_type) ||
273+
if(_send_uint32(self->socket, msg_type) ||
274274
_send_uint32(self->socket, channel_len) ||
275-
(channel_len != _send_fully(self->socket, channel, channel_len)))
275+
(channel_len != _send_fully(self->socket, channel, channel_len)))
276276
{
277277
perror("LCM tcpq");
278278
dbg(DBG_LCM, "Disconnected!\n");
@@ -353,12 +353,12 @@ lcm_tcpq_handle(lcm_tcpq_t * self)
353353
uint32_t channel_len;
354354
if(_recv_uint32(self->socket, &channel_len))
355355
goto disconnected;
356-
if(_ensure_buf_capacity((void**)&self->recv_channel_buf,
356+
if(_ensure_buf_capacity((void**)&self->recv_channel_buf,
357357
&self->recv_channel_buf_len, channel_len+1)) {
358358
fprintf(stderr, "Memory allocation error\n");
359359
return -1;
360360
}
361-
if(channel_len != _recv_fully(self->socket, self->recv_channel_buf,
361+
if(channel_len != _recv_fully(self->socket, self->recv_channel_buf,
362362
channel_len))
363363
goto disconnected;
364364
self->recv_channel_buf[channel_len] = 0;
@@ -404,7 +404,7 @@ lcm_tcpq_publish(lcm_tcpq_t *self, const char *channel, const void *data,
404404
_send_uint32(self->socket, channel_len) ||
405405
(channel_len != _send_fully(self->socket, channel, channel_len)) ||
406406
_send_uint32(self->socket, datalen) ||
407-
(datalen != _send_fully(self->socket, data, datalen)))
407+
(datalen != _send_fully(self->socket, data, datalen)))
408408
{
409409
perror("LCM tcpq send");
410410
dbg(DBG_LCM, "Disconnected!\n");
@@ -422,15 +422,15 @@ static lcm_provider_info_t tcpq_info;
422422
void
423423
lcm_tcpq_provider_init (GPtrArray * providers)
424424
{
425-
tcpq_vtable.create = lcm_tcpq_create;
425+
tcpq_vtable.create = lcm_tcpq_create;
426426
tcpq_vtable.destroy = lcm_tcpq_destroy;
427427
tcpq_vtable.subscribe = lcm_tcpq_subscribe;
428428
tcpq_vtable.unsubscribe = lcm_tcpq_unsubscribe;
429429
tcpq_vtable.publish = lcm_tcpq_publish;
430430
tcpq_vtable.handle = lcm_tcpq_handle;
431431
tcpq_vtable.get_fileno = lcm_tcpq_get_fileno;
432432

433-
tcpq_info.name = "tcpq";
433+
tcpq_info.name = "tcpq";
434434
tcpq_info.vtable = &tcpq_vtable;
435435

436436
g_ptr_array_add (providers, &tcpq_info);

0 commit comments

Comments
 (0)