Clean up empty indented lines

master
Nicolas Favre-Felix 4 years ago
parent c38e80a860
commit 1589b77da9
No known key found for this signature in database
GPG Key ID: C04E7AA8B6F73372

@ -30,9 +30,9 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
char* codechar = code_out; char* codechar = code_out;
char result; char result;
char fragment; char fragment;
result = state_in->result; result = state_in->result;
switch (state_in->step) switch (state_in->step)
{ {
while (1) 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); *codechar++ = base64_encode_value(result);
result = (fragment & 0x03f) >> 0; result = (fragment & 0x03f) >> 0;
*codechar++ = base64_encode_value(result); *codechar++ = base64_encode_value(result);
++(state_in->stepcount); ++(state_in->stepcount);
if (state_in->stepcount == CHARS_PER_LINE/4) 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) int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
{ {
char* codechar = code_out; char* codechar = code_out;
switch (state_in->step) switch (state_in->step)
{ {
case step_B: case step_B:
@ -103,7 +103,7 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
break; break;
} }
*codechar++ = '\n'; *codechar++ = '\n';
return codechar - code_out; return codechar - code_out;
} }

@ -51,7 +51,7 @@ cmd_free(struct cmd *c) {
|| cmd_is_subscribe(c))) { || cmd_is_subscribe(c))) {
pool_free_context(c->ac); pool_free_context(c->ac);
} }
for(i = 0; i < c->count; ++i) { for(i = 0; i < c->count; ++i) {
free((char*)c->argv[i]); free((char*)c->argv[i]);
} }

@ -235,7 +235,7 @@ conf_parse_acl(json_t *j) {
size_t len, plain_len = strlen(plain) + 0; size_t len, plain_len = strlen(plain) + 0;
len = (plain_len + 8) * 8 / 6; len = (plain_len + 8) * 8 / 6;
a->http_basic_auth = calloc(len, 1); a->http_basic_auth = calloc(len, 1);
base64_init_encodestate(&b64); base64_init_encodestate(&b64);
pos = base64_encode_block(plain, (int)plain_len, a->http_basic_auth, &b64); pos = base64_encode_block(plain, (int)plain_len, a->http_basic_auth, &b64);
if(!pos) { /* nothing was encoded */ if(!pos) { /* nothing was encoded */

@ -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"); format_send_error(cmd, 503, "Service Unavailable");
} }
} }
/* cleanup */ /* cleanup */
if(free_cmd) { if(free_cmd) {
cmd_free(cmd); cmd_free(cmd);

@ -114,15 +114,15 @@ json_array_to_keyvalue_reply(const redisReply *r) {
case REDIS_REPLY_NIL: case REDIS_REPLY_NIL:
json_object_set_new(jroot, k->str, json_null()); json_object_set_new(jroot, k->str, json_null());
break; break;
case REDIS_REPLY_STRING: case REDIS_REPLY_STRING:
json_object_set_new(jroot, k->str, json_string(v->str)); json_object_set_new(jroot, k->str, json_string(v->str));
break; break;
case REDIS_REPLY_INTEGER: case REDIS_REPLY_INTEGER:
json_object_set_new(jroot, k->str, json_integer(v->integer)); json_object_set_new(jroot, k->str, json_integer(v->integer));
break; break;
case REDIS_REPLY_ARRAY: case REDIS_REPLY_ARRAY:
if(!(jlist = json_expand_array(v))) { if(!(jlist = json_expand_array(v))) {
jlist = json_null(); jlist = json_null();
@ -130,12 +130,12 @@ json_array_to_keyvalue_reply(const redisReply *r) {
json_object_set_new(jroot, k->str, jlist); json_object_set_new(jroot, k->str, jlist);
break; break;
default: default:
json_decref(jroot); json_decref(jroot);
return NULL; return NULL;
} }
} }
return jroot; return jroot;
} }
@ -154,18 +154,18 @@ json_expand_array(const redisReply *r) {
case REDIS_REPLY_STRING: case REDIS_REPLY_STRING:
json_array_append_new(jlist, json_string(e->str)); json_array_append_new(jlist, json_string(e->str));
break; break;
case REDIS_REPLY_INTEGER: case REDIS_REPLY_INTEGER:
json_array_append_new(jlist, json_integer(e->integer)); json_array_append_new(jlist, json_integer(e->integer));
break; break;
case REDIS_REPLY_ARRAY: case REDIS_REPLY_ARRAY:
if(!(sublist = json_expand_array(e))) { if(!(sublist = json_expand_array(e))) {
sublist = json_null(); sublist = json_null();
} }
json_array_append_new(jlist, sublist); json_array_append_new(jlist, sublist);
break; break;
case REDIS_REPLY_NIL: case REDIS_REPLY_NIL:
default: default:
json_array_append_new(jlist, json_null()); json_array_append_new(jlist, json_null());
@ -277,14 +277,14 @@ json_xpending_list(const redisReply *r) {
case REDIS_REPLY_STRING: case REDIS_REPLY_STRING:
json_object_set_new(jown, own->str, json_string(msgs->str)); json_object_set_new(jown, own->str, json_string(msgs->str));
break; break;
case REDIS_REPLY_INTEGER: case REDIS_REPLY_INTEGER:
json_object_set_new(jown, own->str, json_integer(msgs->integer)); json_object_set_new(jown, own->str, json_integer(msgs->integer));
break; break;
} }
} }
json_object_set_new(jobj, "msgsperconsumer", jown); json_object_set_new(jobj, "msgsperconsumer", jown);
return jobj; return jobj;
} }
@ -335,11 +335,11 @@ json_georadius_with_list(const redisReply *r) {
case REDIS_REPLY_INTEGER: case REDIS_REPLY_INTEGER:
json_object_set_new(jobj, "hash", json_integer(e->element[j]->integer)); json_object_set_new(jobj, "hash", json_integer(e->element[j]->integer));
break; break;
case REDIS_REPLY_STRING: case REDIS_REPLY_STRING:
json_object_set_new(jobj, "dist", json_string(e->element[j]->str)); json_object_set_new(jobj, "dist", json_string(e->element[j]->str));
break; break;
case REDIS_REPLY_ARRAY: case REDIS_REPLY_ARRAY:
if(e->element[j]->type != REDIS_REPLY_ARRAY || e->element[j]->elements != 2) { if(e->element[j]->type != REDIS_REPLY_ARRAY || e->element[j]->elements != 2) {
continue; continue;
@ -353,7 +353,7 @@ json_georadius_with_list(const redisReply *r) {
json_object_set_new(jobj, "coords", jcoo); json_object_set_new(jobj, "coords", jcoo);
break; break;
} }
} }
json_array_append_new(jlist, jobj); json_array_append_new(jlist, jobj);
} }
@ -430,7 +430,7 @@ json_wrap_redis_reply(const struct cmd *cmd, const redisReply *r) {
} }
break; break;
} }
if(!(jlist = json_expand_array(r))) { if(!(jlist = json_expand_array(r))) {
jlist = json_null(); jlist = json_null();
} }

@ -101,7 +101,7 @@ end:
static char * static char *
raw_array(const redisReply *r, size_t *sz) { raw_array(const redisReply *r, size_t *sz) {
unsigned int i; unsigned int i;
char *ret, *p; char *ret, *p;

@ -118,9 +118,9 @@ http_can_write(int fd, short event, void *p) {
struct http_response *r = p; struct http_response *r = p;
(void)event; (void)event;
ret = write(fd, r->out + r->sent, r->out_sz - r->sent); ret = write(fd, r->out + r->sent, r->out_sz - r->sent);
if(ret > 0) if(ret > 0)
r->sent += ret; r->sent += ret;
@ -152,7 +152,7 @@ format_chunk(const char *p, size_t sz, size_t *out_sz) {
/* calculate format size */ /* calculate format size */
chunk_size = sprintf(tmp, "%x\r\n", (int)sz); chunk_size = sprintf(tmp, "%x\r\n", (int)sz);
*out_sz = chunk_size + sz + 2; *out_sz = chunk_size + sz + 2;
out = malloc(*out_sz); out = malloc(*out_sz);
memcpy(out, tmp, chunk_size); memcpy(out, tmp, chunk_size);

@ -92,7 +92,7 @@ socket_setup(struct server *s, const char *ip, int port) {
struct server * struct server *
server_new(const char *cfg_file) { server_new(const char *cfg_file) {
int i; int i;
struct server *s = calloc(1, sizeof(struct server)); struct server *s = calloc(1, sizeof(struct server));
@ -235,7 +235,7 @@ server_start(struct server *s) {
if(s->fd < 0) { if(s->fd < 0) {
return -1; return -1;
} }
/*set keepalive socket option to do with half connection*/ /*set keepalive socket option to do with half connection*/
int keep_alive = 1; int keep_alive = 1;
setsockopt(s->fd , SOL_SOCKET, SO_KEEPALIVE, (void*)&keep_alive, sizeof(keep_alive)); setsockopt(s->fd , SOL_SOCKET, SO_KEEPALIVE, (void*)&keep_alive, sizeof(keep_alive));

@ -225,7 +225,7 @@ ws_msg_new() {
static void static void
ws_msg_add(struct ws_msg *m, const char *p, size_t psz, const unsigned char *mask) { ws_msg_add(struct ws_msg *m, const char *p, size_t psz, const unsigned char *mask) {
/* add data to frame */ /* add data to frame */
size_t i; size_t i;
m->payload = realloc(m->payload, m->payload_sz + psz); m->payload = realloc(m->payload, m->payload_sz + psz);
@ -250,7 +250,7 @@ ws_msg_free(struct ws_msg **m) {
static enum ws_state static enum ws_state
ws_parse_data(const char *frame, size_t sz, struct ws_msg **msg) { ws_parse_data(const char *frame, size_t sz, struct ws_msg **msg) {
int has_mask; int has_mask;
uint64_t len; uint64_t len;
const char *p; const char *p;
@ -368,7 +368,7 @@ ws_reply(struct cmd *cmd, const char *p, size_t sz) {
if (cmd_is_subscribe(cmd)) { if (cmd_is_subscribe(cmd)) {
r->keep_alive = 1; r->keep_alive = 1;
} }
if (r == NULL) if (r == NULL)
return -1; return -1;

@ -136,7 +136,7 @@ reader_can_read(int fd, short event, void *ptr) {
} }
} while(1); } while(1);
} }
cx_install(c); cx_install(c);
} }
@ -320,7 +320,7 @@ main(int argc, char *argv[]) {
/* save time now */ /* save time now */
clock_gettime(CLOCK_MONOTONIC, &t0); clock_gettime(CLOCK_MONOTONIC, &t0);
/* run test */ /* run test */
event_base_dispatch(base); event_base_dispatch(base);

@ -245,7 +245,7 @@ main(int argc, char *argv[]) {
struct host_info hi = {host_default, port_default}; struct host_info hi = {host_default, port_default};
struct worker_thread *workers; struct worker_thread *workers;
/* getopt */ /* getopt */
while ((opt = getopt(argc, argv, "h:p:c:n:v")) != -1) { while ((opt = getopt(argc, argv, "h:p:c:n:v")) != -1) {
switch (opt) { switch (opt) {

Loading…
Cancel
Save