diff options
author | Kate Stone <katherine.stone@apple.com> | 2016-09-06 20:57:50 +0000 |
---|---|---|
committer | Kate Stone <katherine.stone@apple.com> | 2016-09-06 20:57:50 +0000 |
commit | b9c1b51e45b845debb76d8658edabca70ca56079 (patch) | |
tree | dfcb5a13ef2b014202340f47036da383eaee74aa /lldb/tools/debugserver/source/RNBSocket.h | |
parent | d5aa73376966339caad04013510626ec2e42c760 (diff) | |
download | bcm5719-llvm-b9c1b51e45b845debb76d8658edabca70ca56079.tar.gz bcm5719-llvm-b9c1b51e45b845debb76d8658edabca70ca56079.zip |
*** This commit represents a complete reformatting of the LLDB source code
*** to conform to clang-format’s LLVM style. This kind of mass change has
*** two obvious implications:
Firstly, merging this particular commit into a downstream fork may be a huge
effort. Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit. The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):
find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;
The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.
Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit. There are alternatives available that will attempt
to look through this change and find the appropriate prior commit. YMMV.
llvm-svn: 280751
Diffstat (limited to 'lldb/tools/debugserver/source/RNBSocket.h')
-rw-r--r-- | lldb/tools/debugserver/source/RNBSocket.h | 76 |
1 files changed, 35 insertions, 41 deletions
diff --git a/lldb/tools/debugserver/source/RNBSocket.h b/lldb/tools/debugserver/source/RNBSocket.h index 32f4ebeed2a..9f636d85562 100644 --- a/lldb/tools/debugserver/source/RNBSocket.h +++ b/lldb/tools/debugserver/source/RNBSocket.h @@ -14,72 +14,66 @@ #ifndef __RNBSocket_h__ #define __RNBSocket_h__ +#include "DNBTimer.h" #include "RNBDefs.h" +#include <string> #include <sys/socket.h> #include <sys/types.h> -#include <string> -#include "DNBTimer.h" #ifdef WITH_LOCKDOWN #include "lockdown.h" #endif -class RNBSocket -{ +class RNBSocket { public: - typedef void (*PortBoundCallback) (const void *baton, uint16_t port); + typedef void (*PortBoundCallback)(const void *baton, uint16_t port); - RNBSocket () : - m_fd (-1), + RNBSocket() + : m_fd(-1), #ifdef WITH_LOCKDOWN - m_fd_from_lockdown (false), - m_ld_conn (), + m_fd_from_lockdown(false), m_ld_conn(), #endif - m_timer (true) // Make a thread safe timer - { - } - ~RNBSocket (void) - { - Disconnect (false); - } - - rnb_err_t Listen (const char *listen_host, - uint16_t port, - PortBoundCallback callback, - const void *callback_baton); - rnb_err_t Connect (const char *host, uint16_t port); - - rnb_err_t useFD(int fd); + m_timer(true) // Make a thread safe timer + { + } + ~RNBSocket(void) { Disconnect(false); } + + rnb_err_t Listen(const char *listen_host, uint16_t port, + PortBoundCallback callback, const void *callback_baton); + rnb_err_t Connect(const char *host, uint16_t port); + + rnb_err_t useFD(int fd); #ifdef WITH_LOCKDOWN - rnb_err_t ConnectToService(); + rnb_err_t ConnectToService(); #endif - rnb_err_t OpenFile (const char *path); - rnb_err_t Disconnect (bool save_errno); - rnb_err_t Read (std::string &p); - rnb_err_t Write (const void *buffer, size_t length); + rnb_err_t OpenFile(const char *path); + rnb_err_t Disconnect(bool save_errno); + rnb_err_t Read(std::string &p); + rnb_err_t Write(const void *buffer, size_t length); - bool IsConnected () const { return m_fd != -1; } - void SaveErrno (int curr_errno); - DNBTimer& Timer() { return m_timer; } + bool IsConnected() const { return m_fd != -1; } + void SaveErrno(int curr_errno); + DNBTimer &Timer() { return m_timer; } + + static int SetSocketOption(int fd, int level, int option_name, + int option_value); - static int SetSocketOption(int fd, int level, int option_name, int option_value); private: - // Outlaw some constructors - RNBSocket (const RNBSocket &); + // Outlaw some constructors + RNBSocket(const RNBSocket &); protected: - rnb_err_t ClosePort (int& fd, bool save_errno); + rnb_err_t ClosePort(int &fd, bool save_errno); - int m_fd; // Socket we use to communicate once conn established + int m_fd; // Socket we use to communicate once conn established #ifdef WITH_LOCKDOWN - bool m_fd_from_lockdown; - lockdown_connection m_ld_conn; + bool m_fd_from_lockdown; + lockdown_connection m_ld_conn; #endif - DNBTimer m_timer; + DNBTimer m_timer; }; - #endif // #ifndef __RNBSocket_h__ |