diff options
author | 2017-09-25 12:38:35 -0700 | |
---|---|---|
committer | 2017-09-25 12:38:35 -0700 | |
commit | 68ee7ce732f7c45f0cf85d672ef38542639244c6 (patch) | |
tree | 5b3c083f9978c8c0efed408572f41dccdacb54f0 /src/core/lib/compression | |
parent | 1c285b98122ef8fe31aa3325a4c10f5b05107ca8 (diff) |
clang-format
Diffstat (limited to 'src/core/lib/compression')
-rw-r--r-- | src/core/lib/compression/algorithm_metadata.h | 5 | ||||
-rw-r--r-- | src/core/lib/compression/compression.c | 25 | ||||
-rw-r--r-- | src/core/lib/compression/compression_internal.c | 13 |
3 files changed, 24 insertions, 19 deletions
diff --git a/src/core/lib/compression/algorithm_metadata.h b/src/core/lib/compression/algorithm_metadata.h index 3e90ca637d..7db771ea74 100644 --- a/src/core/lib/compression/algorithm_metadata.h +++ b/src/core/lib/compression/algorithm_metadata.h @@ -30,13 +30,14 @@ grpc_slice grpc_compression_algorithm_slice( /** Find compression algorithm based on passed in mdstr - returns * GRPC_COMPRESS_ALGORITHM_COUNT on failure */ grpc_compression_algorithm grpc_compression_algorithm_from_slice( - grpc_slice str); + grpc_slice str); /** Return compression algorithm based metadata element */ grpc_mdelem grpc_compression_encoding_mdelem( grpc_compression_algorithm algorithm); -/** Return message compression algorithm based metadata element (grpc-encoding: xxx) */ +/** Return message compression algorithm based metadata element (grpc-encoding: + * xxx) */ grpc_mdelem grpc_message_compression_encoding_mdelem( grpc_message_compression_algorithm algorithm); diff --git a/src/core/lib/compression/compression.c b/src/core/lib/compression/compression.c index 97a63654f3..d06b2eed33 100644 --- a/src/core/lib/compression/compression.c +++ b/src/core/lib/compression/compression.c @@ -30,11 +30,12 @@ int grpc_compression_algorithm_is_message( grpc_compression_algorithm algorithm) { return (algorithm >= GRPC_COMPRESS_MESSAGE_DEFLATE && - algorithm <= GRPC_COMPRESS_MESSAGE_GZIP) ? 1 : 0; + algorithm <= GRPC_COMPRESS_MESSAGE_GZIP) + ? 1 + : 0; } -int grpc_compression_algorithm_is_stream( - grpc_compression_algorithm algorithm) { +int grpc_compression_algorithm_is_stream(grpc_compression_algorithm algorithm) { return (algorithm == GRPC_COMPRESS_STREAM_GZIP) ? 1 : 0; } @@ -92,8 +93,7 @@ grpc_compression_algorithm grpc_compression_algorithm_for_level( &algo, grpc_message_compression_algorithm_for_level( grpc_compression_level_to_message_compression_level(level), - grpc_compression_bitset_to_message_bitset( - accepted_encodings)), + grpc_compression_bitset_to_message_bitset(accepted_encodings)), 0)); return algo; } else if (level <= GRPC_COMPRESS_LEVEL_STREAM_HIGH) { @@ -102,8 +102,7 @@ grpc_compression_algorithm grpc_compression_algorithm_for_level( &algo, 0, grpc_stream_compression_algorithm_for_level( grpc_compression_level_to_stream_compression_level(level), - grpc_compression_bitset_to_stream_bitset( - accepted_encodings)))); + grpc_compression_bitset_to_stream_bitset(accepted_encodings)))); return algo; } else { gpr_log(GPR_ERROR, "Unknown compression level: %d", level); @@ -151,11 +150,14 @@ grpc_slice grpc_compression_algorithm_slice( } grpc_compression_algorithm grpc_compression_algorithm_from_slice( - grpc_slice str) { + grpc_slice str) { if (grpc_slice_eq(str, GRPC_MDSTR_IDENTITY)) return GRPC_COMPRESS_NONE; - if (grpc_slice_eq(str, GRPC_MDSTR_MESSAGE_SLASH_DEFLATE)) return GRPC_COMPRESS_MESSAGE_DEFLATE; - if (grpc_slice_eq(str, GRPC_MDSTR_MESSAGE_SLASH_GZIP)) return GRPC_COMPRESS_MESSAGE_GZIP; - if (grpc_slice_eq(str, GRPC_MDSTR_STREAM_SLASH_GZIP)) return GRPC_COMPRESS_STREAM_GZIP; + if (grpc_slice_eq(str, GRPC_MDSTR_MESSAGE_SLASH_DEFLATE)) + return GRPC_COMPRESS_MESSAGE_DEFLATE; + if (grpc_slice_eq(str, GRPC_MDSTR_MESSAGE_SLASH_GZIP)) + return GRPC_COMPRESS_MESSAGE_GZIP; + if (grpc_slice_eq(str, GRPC_MDSTR_STREAM_SLASH_GZIP)) + return GRPC_COMPRESS_STREAM_GZIP; return GRPC_COMPRESS_ALGORITHMS_COUNT; } @@ -175,4 +177,3 @@ grpc_mdelem grpc_compression_encoding_mdelem( } return GRPC_MDNULL; } - diff --git a/src/core/lib/compression/compression_internal.c b/src/core/lib/compression/compression_internal.c index 8e0a14dead..e31eb830f1 100644 --- a/src/core/lib/compression/compression_internal.c +++ b/src/core/lib/compression/compression_internal.c @@ -94,7 +94,8 @@ grpc_compression_level_to_stream_compression_level( return GRPC_STREAM_COMPRESS_LEVEL_NONE; } return (grpc_stream_compression_level)( - (uint32_t)(level - (GRPC_MESSAGE_COMPRESS_LEVEL_COUNT - 1) - GRPC_COMPRESS_LEVEL_NONE) + + (uint32_t)(level - (GRPC_MESSAGE_COMPRESS_LEVEL_COUNT - 1) - + GRPC_COMPRESS_LEVEL_NONE) + (uint32_t)GRPC_STREAM_COMPRESS_LEVEL_NONE); } @@ -136,7 +137,9 @@ uint32_t grpc_compression_bitset_to_stream_bitset(uint32_t bitset) { uint32_t grpc_compression_bitset_from_message_stream_compression_bitset( uint32_t message_bitset, uint32_t stream_bitset) { - uint32_t offset_stream_bitset = (stream_bitset & 1u) | ((stream_bitset & (~1u)) << (GRPC_MESSAGE_COMPRESS_ALGORITHMS_COUNT - 1)); + uint32_t offset_stream_bitset = + (stream_bitset & 1u) | + ((stream_bitset & (~1u)) << (GRPC_MESSAGE_COMPRESS_ALGORITHMS_COUNT - 1)); return message_bitset | offset_stream_bitset; } @@ -184,8 +187,9 @@ int grpc_compression_algorithm_from_message_stream_compression_algorithm( int grpc_message_compression_algorithm_name( grpc_message_compression_algorithm algorithm, const char **name) { - GRPC_API_TRACE("grpc_message_compression_algorithm_parse(algorithm=%d, name=%p)", 2, - ((int)algorithm, name)); + GRPC_API_TRACE( + "grpc_message_compression_algorithm_parse(algorithm=%d, name=%p)", 2, + ((int)algorithm, name)); switch (algorithm) { case GRPC_MESSAGE_COMPRESS_NONE: *name = "identity"; @@ -307,4 +311,3 @@ int grpc_stream_compression_algorithm_parse( } return 0; } - |