From 1589b77da906215cfa67a702b7bb54fa1a3c008c Mon Sep 17 00:00:00 2001 From: Nicolas Favre-Felix Date: Fri, 18 Dec 2020 07:33:44 -0800 Subject: [PATCH] Clean up empty indented lines --- src/b64/cencode.c | 10 +++++----- src/cmd.c | 2 +- src/conf.c | 2 +- src/formats/common.c | 2 +- src/formats/json.c | 28 ++++++++++++++-------------- src/formats/raw.c | 2 +- src/http.c | 6 +++--- src/server.c | 4 ++-- src/websocket.c | 6 +++--- tests/pubsub.c | 4 ++-- tests/websocket.c | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/b64/cencode.c b/src/b64/cencode.c index 40f1c88..ade935f 100644 --- a/src/b64/cencode.c +++ b/src/b64/cencode.c @@ -30,9 +30,9 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, char* codechar = code_out; char result; char fragment; - + result = state_in->result; - + switch (state_in->step) { while (1) @@ -71,7 +71,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, *codechar++ = base64_encode_value(result); result = (fragment & 0x03f) >> 0; *codechar++ = base64_encode_value(result); - + ++(state_in->stepcount); if (state_in->stepcount == CHARS_PER_LINE/4) { @@ -87,7 +87,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, int base64_encode_blockend(char* code_out, base64_encodestate* state_in) { char* codechar = code_out; - + switch (state_in->step) { case step_B: @@ -103,7 +103,7 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in) break; } *codechar++ = '\n'; - + return codechar - code_out; } diff --git a/src/cmd.c b/src/cmd.c index a553050..e87cdd9 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -51,7 +51,7 @@ cmd_free(struct cmd *c) { || cmd_is_subscribe(c))) { pool_free_context(c->ac); } - + for(i = 0; i < c->count; ++i) { free((char*)c->argv[i]); } diff --git a/src/conf.c b/src/conf.c index c679548..2a6128f 100644 --- a/src/conf.c +++ b/src/conf.c @@ -235,7 +235,7 @@ conf_parse_acl(json_t *j) { size_t len, plain_len = strlen(plain) + 0; len = (plain_len + 8) * 8 / 6; a->http_basic_auth = calloc(len, 1); - + base64_init_encodestate(&b64); pos = base64_encode_block(plain, (int)plain_len, a->http_basic_auth, &b64); if(!pos) { /* nothing was encoded */ diff --git a/src/formats/common.c b/src/formats/common.c index ed9f041..296b822 100644 --- a/src/formats/common.c +++ b/src/formats/common.c @@ -117,7 +117,7 @@ format_send_reply(struct cmd *cmd, const char *p, size_t sz, const char *content format_send_error(cmd, 503, "Service Unavailable"); } } - + /* cleanup */ if(free_cmd) { cmd_free(cmd); diff --git a/src/formats/json.c b/src/formats/json.c index 26bdb0a..707bc54 100644 --- a/src/formats/json.c +++ b/src/formats/json.c @@ -114,15 +114,15 @@ json_array_to_keyvalue_reply(const redisReply *r) { case REDIS_REPLY_NIL: json_object_set_new(jroot, k->str, json_null()); break; - + case REDIS_REPLY_STRING: json_object_set_new(jroot, k->str, json_string(v->str)); break; - + case REDIS_REPLY_INTEGER: json_object_set_new(jroot, k->str, json_integer(v->integer)); break; - + case REDIS_REPLY_ARRAY: if(!(jlist = json_expand_array(v))) { jlist = json_null(); @@ -130,12 +130,12 @@ json_array_to_keyvalue_reply(const redisReply *r) { json_object_set_new(jroot, k->str, jlist); break; - + default: json_decref(jroot); return NULL; } - + } return jroot; } @@ -154,18 +154,18 @@ json_expand_array(const redisReply *r) { case REDIS_REPLY_STRING: json_array_append_new(jlist, json_string(e->str)); break; - + case REDIS_REPLY_INTEGER: json_array_append_new(jlist, json_integer(e->integer)); break; - + case REDIS_REPLY_ARRAY: if(!(sublist = json_expand_array(e))) { sublist = json_null(); } json_array_append_new(jlist, sublist); break; - + case REDIS_REPLY_NIL: default: json_array_append_new(jlist, json_null()); @@ -277,14 +277,14 @@ json_xpending_list(const redisReply *r) { case REDIS_REPLY_STRING: json_object_set_new(jown, own->str, json_string(msgs->str)); break; - + case REDIS_REPLY_INTEGER: json_object_set_new(jown, own->str, json_integer(msgs->integer)); break; } } json_object_set_new(jobj, "msgsperconsumer", jown); - + return jobj; } @@ -335,11 +335,11 @@ json_georadius_with_list(const redisReply *r) { case REDIS_REPLY_INTEGER: json_object_set_new(jobj, "hash", json_integer(e->element[j]->integer)); break; - + case REDIS_REPLY_STRING: json_object_set_new(jobj, "dist", json_string(e->element[j]->str)); break; - + case REDIS_REPLY_ARRAY: if(e->element[j]->type != REDIS_REPLY_ARRAY || e->element[j]->elements != 2) { continue; @@ -353,7 +353,7 @@ json_georadius_with_list(const redisReply *r) { json_object_set_new(jobj, "coords", jcoo); break; } - + } json_array_append_new(jlist, jobj); } @@ -430,7 +430,7 @@ json_wrap_redis_reply(const struct cmd *cmd, const redisReply *r) { } break; } - + if(!(jlist = json_expand_array(r))) { jlist = json_null(); } diff --git a/src/formats/raw.c b/src/formats/raw.c index fdc9051..20c3927 100644 --- a/src/formats/raw.c +++ b/src/formats/raw.c @@ -101,7 +101,7 @@ end: static char * raw_array(const redisReply *r, size_t *sz) { - + unsigned int i; char *ret, *p; diff --git a/src/http.c b/src/http.c index 09001e2..5296d75 100644 --- a/src/http.c +++ b/src/http.c @@ -118,9 +118,9 @@ http_can_write(int fd, short event, void *p) { struct http_response *r = p; (void)event; - + ret = write(fd, r->out + r->sent, r->out_sz - r->sent); - + if(ret > 0) r->sent += ret; @@ -152,7 +152,7 @@ format_chunk(const char *p, size_t sz, size_t *out_sz) { /* calculate format size */ chunk_size = sprintf(tmp, "%x\r\n", (int)sz); - + *out_sz = chunk_size + sz + 2; out = malloc(*out_sz); memcpy(out, tmp, chunk_size); diff --git a/src/server.c b/src/server.c index 552a0fa..34d6d8e 100644 --- a/src/server.c +++ b/src/server.c @@ -92,7 +92,7 @@ socket_setup(struct server *s, const char *ip, int port) { struct server * server_new(const char *cfg_file) { - + int i; struct server *s = calloc(1, sizeof(struct server)); @@ -235,7 +235,7 @@ server_start(struct server *s) { if(s->fd < 0) { return -1; } - + /*set keepalive socket option to do with half connection*/ int keep_alive = 1; setsockopt(s->fd , SOL_SOCKET, SO_KEEPALIVE, (void*)&keep_alive, sizeof(keep_alive)); diff --git a/src/websocket.c b/src/websocket.c index f790c13..2fdacbf 100644 --- a/src/websocket.c +++ b/src/websocket.c @@ -225,7 +225,7 @@ ws_msg_new() { static void ws_msg_add(struct ws_msg *m, const char *p, size_t psz, const unsigned char *mask) { - + /* add data to frame */ size_t i; m->payload = realloc(m->payload, m->payload_sz + psz); @@ -250,7 +250,7 @@ ws_msg_free(struct ws_msg **m) { static enum ws_state ws_parse_data(const char *frame, size_t sz, struct ws_msg **msg) { - + int has_mask; uint64_t len; const char *p; @@ -368,7 +368,7 @@ ws_reply(struct cmd *cmd, const char *p, size_t sz) { if (cmd_is_subscribe(cmd)) { r->keep_alive = 1; } - + if (r == NULL) return -1; diff --git a/tests/pubsub.c b/tests/pubsub.c index f4a3451..f1d89e3 100644 --- a/tests/pubsub.c +++ b/tests/pubsub.c @@ -136,7 +136,7 @@ reader_can_read(int fd, short event, void *ptr) { } } while(1); } - + cx_install(c); } @@ -320,7 +320,7 @@ main(int argc, char *argv[]) { /* save time now */ clock_gettime(CLOCK_MONOTONIC, &t0); - + /* run test */ event_base_dispatch(base); diff --git a/tests/websocket.c b/tests/websocket.c index 1bce69d..1b23ed8 100644 --- a/tests/websocket.c +++ b/tests/websocket.c @@ -245,7 +245,7 @@ main(int argc, char *argv[]) { struct host_info hi = {host_default, port_default}; struct worker_thread *workers; - + /* getopt */ while ((opt = getopt(argc, argv, "h:p:c:n:v")) != -1) { switch (opt) {