Skip to content
This repository was archived by the owner on Apr 6, 2019. It is now read-only.

Commit e439f42

Browse files
CylixCylix
committed
provide clang-format configuration & apply it.
1 parent 37569fb commit e439f42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+703
-621
lines changed

‎.clang-format‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
# clang-format style configuration
2+
#
3+
# For more information about each option, pleaser refer to the official documentation
4+
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
5+
---
6+
Language: Cpp
7+
8+
AccessModifierOffset: -2
9+
AlignAfterOpenBracket: DontAlign
10+
AlignConsecutiveAssignments: true
11+
AlignConsecutiveDeclarations: false
12+
AlignEscapedNewlinesLeft: false
13+
AlignOperands: true
14+
AlignTrailingComments: true
15+
AllowAllParametersOfDeclarationOnNextLine: false
16+
AllowShortBlocksOnASingleLine: true
17+
AllowShortCaseLabelsOnASingleLine: true
18+
AllowShortFunctionsOnASingleLine: All
19+
AllowShortIfStatementsOnASingleLine: true
20+
AllowShortLoopsOnASingleLine: true
21+
AlwaysBreakAfterDefinitionReturnType: All
22+
AlwaysBreakAfterReturnType: AllDefinitions
23+
AlwaysBreakBeforeMultilineStrings: false
24+
AlwaysBreakTemplateDeclarations: true
25+
BinPackArguments: true
26+
BinPackParameters: true
27+
# Ignored if BreakBeforeBraces different from Custom
28+
BraceWrapping:
29+
AfterClass: false
30+
AfterControlStatement: false
31+
AfterEnum: false
32+
AfterFunction: false
33+
AfterNamespace: false
34+
AfterObjCDeclaration: false
35+
AfterStruct: false
36+
AfterUnion: false
37+
BeforeCatch: true
38+
BeforeElse: true
39+
IndentBraces: false
40+
BreakBeforeBinaryOperators: NonAssignment
41+
BreakBeforeBraces: Custom
42+
BreakBeforeTernaryOperators: true
43+
BreakConstructorInitializersBeforeComma: true
44+
# Ignored in C++
45+
BreakAfterJavaFieldAnnotations: false
46+
BreakStringLiterals: false
47+
ColumnLimit: 0
48+
CommentPragmas: '.*'
49+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
50+
ConstructorInitializerIndentWidth: 0
51+
ContinuationIndentWidth: 2
52+
Cpp11BracedListStyle: true
53+
DerivePointerAlignment: false
54+
DisableFormat: false
55+
ExperimentalAutoDetectBinPacking: false
56+
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
57+
IncludeCategories:
58+
- Regex: 'cpp_redis'
59+
Priority: 1
60+
IncludeIsMainRegex: '$'
61+
IndentCaseLabels: false
62+
IndentWidth: 2
63+
IndentWrappedFunctionNames: false
64+
# Ignored in C++
65+
JavaScriptQuotes: Leave
66+
# Ignored in C++
67+
JavaScriptWrapImports: true
68+
KeepEmptyLinesAtTheStartOfBlocks: true
69+
MacroBlockBegin: ''
70+
MacroBlockEnd: ''
71+
MaxEmptyLinesToKeep: 2
72+
NamespaceIndentation: None
73+
# Ignored in C++
74+
ObjCBlockIndentWidth: 2
75+
# Ignored in C++
76+
ObjCSpaceAfterProperty: false
77+
# Ignored in C++
78+
ObjCSpaceBeforeProtocolList: true
79+
PenaltyBreakBeforeFirstCallParameter: 19
80+
PenaltyBreakComment: 300
81+
PenaltyBreakFirstLessLess: 120
82+
PenaltyBreakString: 1000
83+
PenaltyExcessCharacter: 1000000
84+
PenaltyReturnTypeOnItsOwnLine: 60
85+
PointerAlignment: Left
86+
ReflowComments: true
87+
SortIncludes: true
88+
SpaceAfterCStyleCast: true
89+
SpaceBeforeAssignmentOperators: true
90+
SpaceBeforeParens: ControlStatements
91+
SpaceInEmptyParentheses: false
92+
SpacesBeforeTrailingComments: 1
93+
SpacesInAngles: false
94+
SpacesInContainerLiterals: true
95+
SpacesInCStyleCastParentheses: false
96+
SpacesInParentheses: false
97+
SpacesInSquareBrackets: false
98+
Standard: Cpp11
99+
TabWidth: 8
100+
UseTab: Never
101+
...

‎clang_format.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
find sources includes tests examples \( -name '*.cpp' -o -name '*.hpp' -o -name '*.ipp' -o -name '*.c' -o -name '*.h' \) -exec clang-format -i {} ';'

‎examples/logger.cpp‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,31 @@
55
class my_logger : public cpp_redis::logger_iface {
66
public:
77
//! ctor & dtor
8-
my_logger(void) = default;
8+
my_logger(void) = default;
99
~my_logger(void) = default;
1010

1111
//! copy ctor & assignment operator
1212
my_logger(const my_logger&) = default;
1313
my_logger& operator=(const my_logger&) = default;
1414

1515
public:
16-
void debug(const std::string& msg, const std::string& file, unsigned int line) {
16+
void
17+
debug(const std::string& msg, const std::string& file, unsigned int line) {
1718
std::cout << "debug: " << msg << " @ " << file << ":" << line << std::endl;
1819
}
1920

20-
void info(const std::string& msg, const std::string& file, unsigned int line) {
21+
void
22+
info(const std::string& msg, const std::string& file, unsigned int line) {
2123
std::cout << "info: " << msg << " @ " << file << ":" << line << std::endl;
2224
}
2325

24-
void warn(const std::string& msg, const std::string& file, unsigned int line) {
26+
void
27+
warn(const std::string& msg, const std::string& file, unsigned int line) {
2528
std::cout << "warn: " << msg << " @ " << file << ":" << line << std::endl;
2629
}
2730

28-
void error(const std::string& msg, const std::string& file, unsigned int line) {
31+
void
32+
error(const std::string& msg, const std::string& file, unsigned int line) {
2933
std::cerr << "error: " << msg << " @ " << file << ":" << line << std::endl;
3034
}
3135
};

‎examples/redis_client.cpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <cpp_redis/cpp_redis>
22

3-
#include <signal.h>
43
#include <iostream>
4+
#include <signal.h>
55

66
volatile std::atomic_bool should_exit(false);
77
cpp_redis::redis_client client;
@@ -17,21 +17,21 @@ int
1717
main(void) {
1818
cpp_redis::active_logger = std::unique_ptr<cpp_redis::logger>(new cpp_redis::logger);
1919

20-
client.connect("127.0.0.1", 6379, [] (cpp_redis::redis_client&) {
20+
client.connect("127.0.0.1", 6379, [](cpp_redis::redis_client&) {
2121
std::cout << "client disconnected (disconnection handler)" << std::endl;
2222
should_exit = true;
2323
});
2424

2525
// same as client.send({ "SET", "hello", "42" }, ...)
26-
client.set("hello", "42", [] (cpp_redis::reply& reply) {
26+
client.set("hello", "42", [](cpp_redis::reply& reply) {
2727
std::cout << reply.as_string() << std::endl;
2828
});
2929
// same as client.send({ "DECRBY", "hello", 12 }, ...)
30-
client.decrby("hello", 12, [] (cpp_redis::reply& reply) {
30+
client.decrby("hello", 12, [](cpp_redis::reply& reply) {
3131
std::cout << reply.as_integer() << std::endl;
3232
});
3333
// same as client.send({ "GET", "hello" }, ...)
34-
client.get("hello", [] (cpp_redis::reply& reply) {
34+
client.get("hello", [](cpp_redis::reply& reply) {
3535
std::cout << reply.as_string() << std::endl;
3636
});
3737
// commands are pipelined and only sent when client.commit() is called
@@ -42,7 +42,8 @@ main(void) {
4242
// client.sync_commit(std::chrono::milliseconds(100));
4343

4444
signal(SIGINT, &sigint_handler);
45-
while (!should_exit);
45+
while (!should_exit)
46+
;
4647

4748
return 0;
4849
}

‎examples/redis_subscriber.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <cpp_redis/cpp_redis>
22

3-
#include <signal.h>
43
#include <iostream>
4+
#include <signal.h>
55

66
volatile std::atomic_bool should_exit(false);
77
cpp_redis::redis_subscriber sub;
@@ -22,16 +22,17 @@ main(void) {
2222
should_exit = true;
2323
});
2424

25-
sub.subscribe("some_chan", [] (const std::string& chan, const std::string& msg) {
25+
sub.subscribe("some_chan", [](const std::string& chan, const std::string& msg) {
2626
std::cout << "MESSAGE " << chan << ": " << msg << std::endl;
2727
});
28-
sub.psubscribe("*", [] (const std::string& chan, const std::string& msg) {
28+
sub.psubscribe("*", [](const std::string& chan, const std::string& msg) {
2929
std::cout << "PMESSAGE " << chan << ": " << msg << std::endl;
3030
});
3131
sub.commit();
3232

3333
signal(SIGINT, &sigint_handler);
34-
while (!should_exit);
34+
while (!should_exit)
35+
;
3536

3637
return 0;
3738
}

‎includes/cpp_redis/builders/builder_iface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <string>
43
#include <memory>
4+
#include <string>
55

66
#include <cpp_redis/reply.hpp>
77

‎includes/cpp_redis/builders/error_builder.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace builders {
1111
class error_builder : public builder_iface {
1212
public:
1313
//! ctor & dtor
14-
error_builder(void) = default;
14+
error_builder(void) = default;
1515
~error_builder(void) = default;
1616

1717
//! copy ctor & assignment operator

‎includes/cpp_redis/builders/reply_builder.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#pragma once
22

3-
#include <string>
4-
#include <stdexcept>
5-
#include <memory>
63
#include <deque>
4+
#include <memory>
5+
#include <stdexcept>
6+
#include <string>
77

8-
#include <cpp_redis/reply.hpp>
98
#include <cpp_redis/builders/builder_iface.hpp>
9+
#include <cpp_redis/reply.hpp>
1010

1111
namespace cpp_redis {
1212

‎includes/cpp_redis/logger.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include <string>
43
#include <memory>
54
#include <mutex>
5+
#include <string>
66

77
namespace cpp_redis {
88

@@ -11,7 +11,7 @@ namespace cpp_redis {
1111
class logger_iface {
1212
public:
1313
//! ctor & dtor
14-
logger_iface(void) = default;
14+
logger_iface(void) = default;
1515
virtual ~logger_iface(void) = default;
1616

1717
//! copy ctor & assignment operator
@@ -20,8 +20,8 @@ class logger_iface {
2020

2121
public:
2222
virtual void debug(const std::string& msg, const std::string& file, unsigned int line) = 0;
23-
virtual void info(const std::string& msg, const std::string& file, unsigned int line) = 0;
24-
virtual void warn(const std::string& msg, const std::string& file, unsigned int line) = 0;
23+
virtual void info(const std::string& msg, const std::string& file, unsigned int line) = 0;
24+
virtual void warn(const std::string& msg, const std::string& file, unsigned int line) = 0;
2525
virtual void error(const std::string& msg, const std::string& file, unsigned int line) = 0;
2626
};
2727

@@ -39,7 +39,7 @@ class logger : public logger_iface {
3939
public:
4040
//! ctor & dtor
4141
logger(log_level level = log_level::info);
42-
~logger(void) = default;
42+
~logger(void) = default;
4343

4444
//! copy ctor & assignment operator
4545
logger(const logger&) = default;
@@ -69,9 +69,9 @@ void error(const std::string& msg, const std::string& file, unsigned int line);
6969
//! convenience macro to log with file and line information
7070
//! if __CPP_REDIS_NO_LOGGING, all logging related lines are removed from source code
7171
#ifdef __CPP_REDIS_NO_LOGGING
72-
# define __CPP_REDIS_LOG(level, msg)
72+
#define __CPP_REDIS_LOG(level, msg)
7373
#else
74-
# define __CPP_REDIS_LOG(level, msg) cpp_redis::level(msg, __FILE__, __LINE__);
74+
#define __CPP_REDIS_LOG(level, msg) cpp_redis::level(msg, __FILE__, __LINE__);
7575
#endif /* __CPP_REDIS_NO_LOGGING */
7676

7777
} //! cpp_redis

‎includes/cpp_redis/network/redis_connection.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#pragma once
22

3+
#include <functional>
34
#include <mutex>
45
#include <string>
56
#include <vector>
6-
#include <functional>
77

88
#ifdef _MSC_VER
9-
# include <cpp_redis/network/windows/tcp_client.hpp>
9+
#include <cpp_redis/network/windows/tcp_client.hpp>
1010
#else
11-
# include <cpp_redis/network/unix/tcp_client.hpp>
11+
#include <cpp_redis/network/unix/tcp_client.hpp>
1212
#endif /* _MSC_VER */
1313

1414
#include <cpp_redis/builders/reply_builder.hpp>
@@ -32,8 +32,8 @@ class redis_connection {
3232
typedef std::function<void(redis_connection&)> disconnection_handler_t;
3333
typedef std::function<void(redis_connection&, reply&)> reply_callback_t;
3434
void connect(const std::string& host = "127.0.0.1", unsigned int port = 6379,
35-
const disconnection_handler_t& disconnection_handler = nullptr,
36-
const reply_callback_t& reply_callback = nullptr);
35+
const disconnection_handler_t& disconnection_handler = nullptr,
36+
const reply_callback_t& reply_callback = nullptr);
3737
void disconnect(void);
3838
bool is_connected(void);
3939

0 commit comments

Comments
 (0)