Skip to content

Commit 1c829ee

Browse files
chu11chu11
authored
Merge pull request #18 from chaos/cleanup
fix tab vs space
2 parents 71e290c + 3fc309c commit 1c829ee

17 files changed

+237
-237
lines changed

‎src/libnodeupdown/nodeupdown.c

+82-82
Original file line numberDiff line numberDiff line change
@@ -415,72 +415,72 @@ nodeupdown_load_data(nodeupdown_t handle,
415415
if (port <= 0)
416416
{
417417
if (conffile_config.port_flag)
418-
{
419-
if (conffile_config.port <= 0)
420-
{
421-
handle->errnum = NODEUPDOWN_ERR_CONF_INPUT;
422-
goto cleanup;
423-
}
424-
port = conffile_config.port;
425-
}
418+
{
419+
if (conffile_config.port <= 0)
420+
{
421+
handle->errnum = NODEUPDOWN_ERR_CONF_INPUT;
422+
goto cleanup;
423+
}
424+
port = conffile_config.port;
425+
}
426426
else if (module_config.port_flag)
427-
{
428-
if (module_config.port <= 0)
429-
{
430-
handle->errnum = NODEUPDOWN_ERR_CONFIG_MODULE;
431-
goto cleanup;
432-
}
433-
port = module_config.port;
434-
}
427+
{
428+
if (module_config.port <= 0)
429+
{
430+
handle->errnum = NODEUPDOWN_ERR_CONFIG_MODULE;
431+
goto cleanup;
432+
}
433+
port = module_config.port;
434+
}
435435
else
436-
{
437-
if (backend_module_default_port(handle) <= 0)
438-
{
439-
handle->errnum = NODEUPDOWN_ERR_BACKEND_MODULE;
440-
goto cleanup;
441-
}
442-
port = backend_module_default_port(handle);
443-
}
436+
{
437+
if (backend_module_default_port(handle) <= 0)
438+
{
439+
handle->errnum = NODEUPDOWN_ERR_BACKEND_MODULE;
440+
goto cleanup;
441+
}
442+
port = backend_module_default_port(handle);
443+
}
444444
}
445445

446446
if (timeout_len <= 0)
447447
{
448448
if (conffile_config.timeout_len_flag)
449-
{
450-
if (conffile_config.timeout_len <= 0)
451-
{
452-
handle->errnum = NODEUPDOWN_ERR_CONF_INPUT;
453-
goto cleanup;
454-
}
455-
timeout_len = conffile_config.timeout_len;
456-
}
449+
{
450+
if (conffile_config.timeout_len <= 0)
451+
{
452+
handle->errnum = NODEUPDOWN_ERR_CONF_INPUT;
453+
goto cleanup;
454+
}
455+
timeout_len = conffile_config.timeout_len;
456+
}
457457
else if (module_config.timeout_len_flag)
458-
{
459-
if (module_config.timeout_len <= 0)
460-
{
461-
handle->errnum = NODEUPDOWN_ERR_CONFIG_MODULE;
462-
goto cleanup;
463-
}
464-
timeout_len = module_config.timeout_len;
465-
}
458+
{
459+
if (module_config.timeout_len <= 0)
460+
{
461+
handle->errnum = NODEUPDOWN_ERR_CONFIG_MODULE;
462+
goto cleanup;
463+
}
464+
timeout_len = module_config.timeout_len;
465+
}
466466
else
467-
{
468-
if (backend_module_default_timeout_len(handle) < 0)
469-
{
470-
handle->errnum = NODEUPDOWN_ERR_BACKEND_MODULE;
471-
goto cleanup;
472-
}
473-
timeout_len = backend_module_default_timeout_len(handle);
474-
}
467+
{
468+
if (backend_module_default_timeout_len(handle) < 0)
469+
{
470+
handle->errnum = NODEUPDOWN_ERR_BACKEND_MODULE;
471+
goto cleanup;
472+
}
473+
timeout_len = backend_module_default_timeout_len(handle);
474+
}
475475
}
476476

477477
if (hostname)
478478
{
479479
if (backend_module_get_updown_data(handle,
480-
hostname,
481-
port,
482-
timeout_len,
483-
module) < 0)
480+
hostname,
481+
port,
482+
timeout_len,
483+
module) < 0)
484484
goto cleanup;
485485
}
486486
else if (conffile_config.hostnames_flag || module_config.hostnames_flag)
@@ -489,25 +489,25 @@ nodeupdown_load_data(nodeupdown_t handle,
489489
int i, hostnames_len;
490490

491491
if (conffile_config.hostnames_flag)
492-
{
493-
hostnames = conffile_config.hostnames;
494-
hostnames_len = conffile_config.hostnames_len;
495-
}
492+
{
493+
hostnames = conffile_config.hostnames;
494+
hostnames_len = conffile_config.hostnames_len;
495+
}
496496
else
497-
{
498-
hostnames = module_config.hostnames;
499-
hostnames_len = module_config.hostnames_len;
500-
}
497+
{
498+
hostnames = module_config.hostnames;
499+
hostnames_len = module_config.hostnames_len;
500+
}
501501

502502
for (i = 0; i < hostnames_len; i++)
503503
{
504504
if (strlen(hostnames[i]) > 0)
505505
{
506506
if (backend_module_get_updown_data(handle,
507-
hostnames[i],
508-
port,
509-
timeout_len,
510-
module) < 0)
507+
hostnames[i],
508+
port,
509+
timeout_len,
510+
module) < 0)
511511
continue;
512512
else
513513
break;
@@ -528,10 +528,10 @@ nodeupdown_load_data(nodeupdown_t handle,
528528
goto cleanup;
529529

530530
if (backend_module_get_updown_data(handle,
531-
hostnamePtr,
532-
port,
533-
timeout_len,
534-
module) < 0)
531+
hostnamePtr,
532+
port,
533+
timeout_len,
534+
module) < 0)
535535
goto cleanup;
536536
}
537537

@@ -745,19 +745,19 @@ _is_node(nodeupdown_t handle, const char *node, int up_or_down)
745745
if (clusterlist_module_found)
746746
{
747747
if ((rv = clusterlist_module_is_node_in_cluster(handle, node)) < 0)
748-
return -1;
748+
return -1;
749749

750750
if (!rv)
751-
{
752-
handle->errnum = NODEUPDOWN_ERR_NOTFOUND;
753-
return -1;
754-
}
751+
{
752+
handle->errnum = NODEUPDOWN_ERR_NOTFOUND;
753+
return -1;
754+
}
755755

756756
if (clusterlist_module_get_nodename(handle,
757-
node,
758-
buffer,
759-
NODEUPDOWN_MAXNODENAMELEN+1) < 0)
760-
return -1;
757+
node,
758+
buffer,
759+
NODEUPDOWN_MAXNODENAMELEN+1) < 0)
760+
return -1;
761761

762762
nodePtr = buffer;
763763
}
@@ -767,11 +767,11 @@ _is_node(nodeupdown_t handle, const char *node, int up_or_down)
767767
* loaded.
768768
*/
769769
if (hostlist_find(handle->up_nodes, node) < 0
770-
&& hostlist_find(handle->down_nodes, node) < 0)
771-
{
772-
handle->errnum = NODEUPDOWN_ERR_NOTFOUND;
773-
return -1;
774-
}
770+
&& hostlist_find(handle->down_nodes, node) < 0)
771+
{
772+
handle->errnum = NODEUPDOWN_ERR_NOTFOUND;
773+
return -1;
774+
}
775775

776776
nodePtr = (char *)node;
777777
}

‎src/libnodeupdown/nodeupdown/nodeupdown_backend_module.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ typedef int (*Nodeupdown_backend_cleanup)(nodeupdown_t);
8383
* Returns 0 on success, -1 on error
8484
*/
8585
typedef int (*Nodeupdown_backend_get_updown_data)(nodeupdown_t,
86-
const char *,
87-
unsigned int,
88-
unsigned int,
89-
char *);
86+
const char *,
87+
unsigned int,
88+
unsigned int,
89+
char *);
9090

9191
/*
9292
* struct nodeupdown_backend_module_info

‎src/libnodeupdown/nodeupdown/nodeupdown_clusterlist_module.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typedef int (*Nodeupdown_clusterlist_get_numnodes)(nodeupdown_t);
6565
* Returns 1 is node is in the cluster, 0 if not, -1 on error
6666
*/
6767
typedef int (*Nodeupdown_clusterlist_is_node_in_cluster)(nodeupdown_t,
68-
const char *);
68+
const char *);
6969

7070
/*
7171
* Nodeupdown_clusterlist_get_nodename
@@ -78,9 +78,9 @@ typedef int (*Nodeupdown_clusterlist_is_node_in_cluster)(nodeupdown_t,
7878
* Returns nodename in buffer, 0 on success, -1 on error
7979
*/
8080
typedef int (*Nodeupdown_clusterlist_get_nodename)(nodeupdown_t,
81-
const char *,
82-
char *,
83-
unsigned int);
81+
const char *,
82+
char *,
83+
unsigned int);
8484

8585
/*
8686
* Nodeupdown_clusterlist_compare_to_clusterlist

‎src/libnodeupdown/nodeupdown/nodeupdown_config_module.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ typedef int (*Nodeupdown_config_cleanup)(nodeupdown_t);
5656
* Returns 0 on success, -1 on error
5757
*/
5858
typedef int (*Nodeupdown_config_load_config)(nodeupdown_t,
59-
struct nodeupdown_config *);
59+
struct nodeupdown_config *);
6060

6161
/*
6262
* struct nodeupdown_config_module_info

‎src/libnodeupdown/nodeupdown_backend_cerebro.c

+16-16
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ cerebro_backend_cleanup(nodeupdown_t handle)
148148
{
149149
#ifndef NDEBUG
150150
fprintf(stderr, "cerebro_handle_destroy: %s\n",
151-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
151+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
152152
#endif /* NDEBUG */
153153
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
154154
return -1;
@@ -177,7 +177,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
177177
{
178178
#ifndef NDEBUG
179179
fprintf(stderr, "cerebro_set_hostname: %s\n",
180-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
180+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
181181
#endif /* NDEBUG */
182182
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
183183
return -1;
@@ -187,7 +187,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
187187
{
188188
#ifndef NDEBUG
189189
fprintf(stderr, "cerebro_set_port: %s\n",
190-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
190+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
191191
#endif /* NDEBUG */
192192
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
193193
return -1;
@@ -197,7 +197,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
197197
{
198198
#ifndef NDEBUG
199199
fprintf(stderr, "cerebro_set_timeout_len: %s\n",
200-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
200+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
201201
#endif /* NDEBUG */
202202
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
203203
return -1;
@@ -208,7 +208,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
208208
{
209209
#ifndef NDEBUG
210210
fprintf(stderr, "cerebro_get_metric_data: %s\n",
211-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
211+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
212212
#endif /* NDEBUG */
213213
if (cerebro_errnum(cerebro_handle) == CEREBRO_ERR_CONNECT)
214214
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_CONNECT);
@@ -225,7 +225,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
225225
{
226226
#ifndef NDEBUG
227227
fprintf(stderr, "cerebro_nodelist_iterator_create: %s\n",
228-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
228+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
229229
#endif /* NDEBUG */
230230
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
231231
goto cleanup;
@@ -241,8 +241,8 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
241241
if (cerebro_nodelist_iterator_nodename(itr, &nodename) < 0)
242242
{
243243
#ifndef NDEBUG
244-
fprintf(stderr, "cerebro_nodelist_iterator_nodename: %s\n",
245-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
244+
fprintf(stderr, "cerebro_nodelist_iterator_nodename: %s\n",
245+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
246246
#endif /* NDEBUG */
247247
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
248248
goto cleanup;
@@ -251,7 +251,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
251251
if (!nodename)
252252
{
253253
#ifndef NDEBUG
254-
fprintf(stderr, "cerebro_nodelist_iterator_create: null nodename\n");
254+
fprintf(stderr, "cerebro_nodelist_iterator_create: null nodename\n");
255255
#endif /* NDEBUG */
256256
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
257257
goto cleanup;
@@ -264,8 +264,8 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
264264
&mvalue) < 0)
265265
{
266266
#ifndef NDEBUG
267-
fprintf(stderr, "cerebro_nodelist_iterator_metric_value: %s\n",
268-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
267+
fprintf(stderr, "cerebro_nodelist_iterator_metric_value: %s\n",
268+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
269269
#endif /* NDEBUG */
270270
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
271271
goto cleanup;
@@ -278,7 +278,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
278278
#endif /* !CEREBRO_METRIC_VALUE_TYPE_U_INT32 */
279279
{
280280
#ifndef NDEBUG
281-
fprintf(stderr, "cerebro_nodelist_iterator_metric_value: invalid mtype: %u\n", mtype);
281+
fprintf(stderr, "cerebro_nodelist_iterator_metric_value: invalid mtype: %u\n", mtype);
282282
#endif /* NDEBUG */
283283
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
284284
goto cleanup;
@@ -287,7 +287,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
287287
if (mlen != sizeof(u_int32_t))
288288
{
289289
#ifndef NDEBUG
290-
fprintf(stderr, "cerebro_nodelist_iterator_metric_value: invalid mlen: %u\n", mlen);
290+
fprintf(stderr, "cerebro_nodelist_iterator_metric_value: invalid mlen: %u\n", mlen);
291291
#endif /* NDEBUG */
292292
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
293293
goto cleanup;
@@ -312,8 +312,8 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
312312
if (cerebro_nodelist_iterator_next(itr) < 0)
313313
{
314314
#ifndef NDEBUG
315-
fprintf(stderr, "cerebro_nodelist_iterator_next: %s\n",
316-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
315+
fprintf(stderr, "cerebro_nodelist_iterator_next: %s\n",
316+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
317317
#endif /* NDEBUG */
318318
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
319319
goto cleanup;
@@ -324,7 +324,7 @@ cerebro_backend_get_updown_data(nodeupdown_t handle,
324324
{
325325
#ifndef NDEBUG
326326
fprintf(stderr, "cerebro_nodelist_iterator_at_end: %s\n",
327-
cerebro_strerror(cerebro_errnum(cerebro_handle)));
327+
cerebro_strerror(cerebro_errnum(cerebro_handle)));
328328
#endif /* NDEBUG */
329329
nodeupdown_set_errnum(handle, NODEUPDOWN_ERR_BACKEND_MODULE);
330330
goto cleanup;

0 commit comments

Comments
 (0)