:: commit 7d2f79ee2f4ac3d54402068aa83dee47c5778832
make format
diff --git a/include/common.h b/include/common.h
index c0f7479..ae94041 100644
--- a/include/common.h
+++ b/include/common.h
@@ -35,7 +35,9 @@ typedef int8_t s8;
typedef int16_t s16;
typedef int32_t s32;
-static s32 read_neutral_s32(u8 * data) { return ((u32) data[0]) | (((u32) data[1]) << 8) | (((u32) data[2]) << 16) | (((u32) data[3]) << 24); }
+static s32 read_neutral_s32(u8 * data) {
+ return ((u32)data[0]) | (((u32)data[1]) << 8) | (((u32)data[2]) << 16) | (((u32)data[3]) << 24);
+}
static void write_neutral_s32(u8 * data, s32 value) {
data[0] = value & 0xFF;
diff --git a/src/cm.c b/src/cm.c
index 77b3974..b6b1e5c 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -45,11 +45,11 @@ void begin(state * s) {
for (int j = 0; j < 256; j++) s->C1[i][j] = 1 << 15;
for (int i = 0; i < 2; i++)
for (int j = 0; j < 256; j++)
- for (int k = 0; k < 17; k++) s->C2[2 * j + i][k] = (k << 12) - (k == 16);
+ for (int k = 0; k < 17; k++) s->C2[2 * j + i][k] = (k << 12) - (k == 16); // Firm difference from stdpack.
}
void encode_bytes(state * s, u8 * buf, s32 size) {
- for(s32 i = 0; i < size; i++) {
+ for (s32 i = 0; i < size; i++) {
u8 c = buf[i];
if (s->c1 == s->c2)
@@ -125,8 +125,8 @@ void decode_bytes(state * s, u8 * c, s32 size) {
s->code = (s->code << 8) + read_in(s);
s->code = (s->code << 8) + read_in(s);
s->code = (s->code << 8) + read_in(s);
-
- for(s32 i = 0; i < size; i++) {
+
+ for (s32 i = 0; i < size; i++) {
if (s->c1 == s->c2)
++s->run;
else
diff --git a/src/libbz3.c b/src/libbz3.c
index bff538d..21d03d4 100644
--- a/src/libbz3.c
+++ b/src/libbz3.c
@@ -189,20 +189,20 @@ PUBLIC_API s32 bz3_decode_block(struct bz3_state * state, u8 * buffer, s32 data_
u32 crc32 = read_neutral_s32(buffer);
s32 bwt_idx = read_neutral_s32(buffer + 4);
- if(data_size > state->block_size + state->block_size / 50 + 32 || data_size < 0) {
+ if (data_size > state->block_size + state->block_size / 50 + 32 || data_size < 0) {
state->last_error = BZ3_ERR_MALFORMED_HEADER;
return -1;
}
if (bwt_idx == -1) {
- if(data_size > 64) {
+ if (data_size > 64) {
state->last_error = BZ3_ERR_MALFORMED_HEADER;
return -1;
}
memmove(buffer, buffer + 8, data_size - 8);
- if(crc32sum(1, buffer, data_size - 8) != crc32) {
+ if (crc32sum(1, buffer, data_size - 8) != crc32) {
state->last_error = BZ3_ERR_CRC;
return -1;
}
@@ -226,7 +226,7 @@ PUBLIC_API s32 bz3_decode_block(struct bz3_state * state, u8 * buffer, s32 data_
return -1;
}
- if(orig_size > state->block_size + state->block_size / 50 + 32 || orig_size < 0) {
+ if (orig_size > state->block_size + state->block_size / 50 + 32 || orig_size < 0) {
state->last_error = BZ3_ERR_MALFORMED_HEADER;
return -1;
}
@@ -251,7 +251,7 @@ PUBLIC_API s32 bz3_decode_block(struct bz3_state * state, u8 * buffer, s32 data_
decode_bytes(state->cm_state, b2, size_src);
swap(b1, b2);
- if(bwt_idx >= size_src) {
+ if (bwt_idx >= size_src) {
state->last_error = BZ3_ERR_MALFORMED_HEADER;
return -1;
}
@@ -277,7 +277,7 @@ PUBLIC_API s32 bz3_decode_block(struct bz3_state * state, u8 * buffer, s32 data_
state->last_error = BZ3_OK;
- if(size_src > state->block_size + state->block_size / 50 + 32 || size_src < 0) {
+ if (size_src > state->block_size + state->block_size / 50 + 32 || size_src < 0) {
state->last_error = BZ3_ERR_MALFORMED_HEADER;
return -1;
}
@@ -297,7 +297,7 @@ PUBLIC_API s32 bz3_decode_block(struct bz3_state * state, u8 * buffer, s32 data_
#ifdef PTHREAD
-#include <pthread.h>
+ #include <pthread.h>
typedef struct {
struct bz3_state * state;
diff --git a/src/lzp.c b/src/lzp.c
index a310c0e..82032ae 100644
--- a/src/lzp.c
+++ b/src/lzp.c
@@ -20,7 +20,7 @@ static s32 lzp_encode_block(const u8 * restrict in, const u8 * in_end, u8 * rest
for (s32 i = 0; i < 4; ++i) *out++ = *in++;
- ctx = ((u32) in[-1]) | (((u32) in[-2]) << 8) | (((u32) in[-3]) << 16) | (((u32) in[-4]) << 24);
+ ctx = ((u32)in[-1]) | (((u32)in[-2]) << 8) | (((u32)in[-3]) << 16) | (((u32)in[-4]) << 24);
while (in < in_end - m_len - 32 && out < out_eob) {
u32 idx = (ctx >> 15 ^ ctx ^ ctx >> 3) & mask;
@@ -46,7 +46,7 @@ static s32 lzp_encode_block(const u8 * restrict in, const u8 * in_end, u8 * rest
len += in[len] == ref[len];
in += len;
- ctx = ((u32) in[-1]) | (((u32) in[-2]) << 8) | (((u32) in[-3]) << 16) | (((u32) in[-4]) << 24);
+ ctx = ((u32)in[-1]) | (((u32)in[-2]) << 8) | (((u32)in[-3]) << 16) | (((u32)in[-4]) << 24);
*out++ = MATCH;
@@ -69,7 +69,7 @@ static s32 lzp_encode_block(const u8 * restrict in, const u8 * in_end, u8 * rest
}
}
- ctx = ((u32) in[-1]) | (((u32) in[-2]) << 8) | (((u32) in[-3]) << 16) | (((u32) in[-4]) << 24);
+ ctx = ((u32)in[-1]) | (((u32)in[-2]) << 8) | (((u32)in[-3]) << 16) | (((u32)in[-4]) << 24);
while (in < in_end && out < out_eob) {
u32 idx = (ctx >> 15 ^ ctx ^ ctx >> 3) & mask;
@@ -95,7 +95,7 @@ static s32 lzp_decode_block(const u8 * restrict in, const u8 * in_end, s32 * res
for (s32 i = 0; i < 4; ++i) *out++ = *in++;
- u32 ctx = ((u32) out[-1]) | (((u32) out[-2]) << 8) | (((u32) out[-3]) << 16) | (((u32) out[-4]) << 24);
+ u32 ctx = ((u32)out[-1]) | (((u32)out[-2]) << 8) | (((u32)out[-3]) << 16) | (((u32)out[-4]) << 24);
while (in < in_end) {
u32 idx = (ctx >> 15 ^ ctx ^ ctx >> 3) & mask;
@@ -115,7 +115,7 @@ static s32 lzp_decode_block(const u8 * restrict in, const u8 * in_end, s32 * res
while (out < out_end) *out++ = *ref++;
- ctx = ((u32) out[-1]) | (((u32) out[-2]) << 8) | (((u32) out[-3]) << 16) | (((u32) out[-4]) << 24);
+ ctx = ((u32)out[-1]) | (((u32)out[-2]) << 8) | (((u32)out[-3]) << 16) | (((u32)out[-4]) << 24);
} else {
in++;
ctx = (ctx << 8) | (*out++ = MATCH);
diff --git a/src/main.c b/src/main.c
index c4220b2..a413f65 100644
--- a/src/main.c
+++ b/src/main.c
@@ -152,7 +152,7 @@ int main(int argc, char * argv[]) {
output = regular_file;
if (!force_stdstreams && output == NULL && input != NULL) {
// strip the bz3 extension
- if(strlen(input) > 4 && !strcmp(input + strlen(input) - 4, ".bz3")) {
+ if (strlen(input) > 4 && !strcmp(input + strlen(input) - 4, ".bz3")) {
output = malloc(strlen(input));
strncpy(output, input, strlen(input) - 4);
output[strlen(input) - 4] = '\0';
@@ -163,8 +163,7 @@ int main(int argc, char * argv[]) {
input = bz3_file != NULL ? bz3_file : regular_file;
}
- if(input == NULL && output == NULL)
- force_stdstreams = 1;
+ if (input == NULL && output == NULL) force_stdstreams = 1;
FILE *input_des, *output_des;
@@ -293,7 +292,7 @@ int main(int argc, char * argv[]) {
return 1;
}
old_size = read_neutral_s32(byteswap_buf);
- if(fread(buffer, 1, new_size, input_des) != new_size) {
+ if (fread(buffer, 1, new_size, input_des) != new_size) {
fprintf(stderr, "I/O error.\n");
return 1;
}
@@ -316,7 +315,7 @@ int main(int argc, char * argv[]) {
return 1;
}
old_size = read_neutral_s32(byteswap_buf);
- if(fread(buffer, 1, new_size, input_des) != new_size) {
+ if (fread(buffer, 1, new_size, input_des) != new_size) {
fprintf(stderr, "I/O error.\n");
return 1;
}
