hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uncrustify maxscale

Browse Source 
See script directory for method. The script to run in the top level
MaxScale directory is called maxscale-uncrustify.sh, which uses
another script, list-src, from the same directory (so you need to set
your PATH). The uncrustify version was 0.66.
This commit is contained in:
Niclas Antti
2018-09-09 22:26:19 +03:00
parent fa7ec95069
commit c447e5cf15
849 changed files with 35002 additions and 27238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/routing/cat/cat.cc
View File

@ -16,8 +16,8 @@
using namespace maxscale;
Cat::Cat(SERVICE* pService):
Router<Cat, CatSession>(pService)
Cat::Cat(SERVICE* pService)
: Router<Cat, CatSession>(pService)
{
}
@ -81,10 +81,10 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
"V1.0.0",
caps,
&Cat::s_object,
NULL, /* Process init. */
NULL, /* Process finish. */
NULL, /* Thread init. */
NULL, /* Thread finish. */
NULL, /* Process init. */
NULL, /* Process finish. */
NULL, /* Thread init. */
NULL, /* Thread finish. */
{
{MXS_END_MODULE_PARAMS}
}

12
server/modules/routing/cat/cat.hh
View File

@ -10,7 +10,7 @@
* of this software will be governed by version 2 or later of the General
* Public License.
*/
#pragma once
#pragma once
#include <maxscale/router.hh>
@ -19,17 +19,17 @@ class CatSession;
/**
* The per instance data for the router.
*/
class Cat: public mxs::Router<Cat, CatSession>
class Cat : public mxs::Router<Cat, CatSession>
{
Cat(const Cat&) = delete;
Cat& operator =(const Cat&) = delete;
Cat& operator=(const Cat&) = delete;
public:
~Cat();
static Cat* create(SERVICE* pService, MXS_CONFIG_PARAMETER* params);
CatSession* newSession(MXS_SESSION* pSession);
void diagnostics(DCB* pDcb);
json_t* diagnostics_json() const;
uint64_t getCapabilities();
void diagnostics(DCB* pDcb);
json_t* diagnostics_json() const;
uint64_t getCapabilities();
private:
friend class CatSession;

18
server/modules/routing/cat/catsession.cc
View File

@ -18,13 +18,13 @@
using namespace maxscale;
CatSession::CatSession(MXS_SESSION* session, Cat* router, SRWBackendList& backends):
RouterSession(session),
m_session(session),
m_backends(backends),
m_completed(0),
m_packet_num(0),
m_query(NULL)
CatSession::CatSession(MXS_SESSION* session, Cat* router, SRWBackendList& backends)
: RouterSession(session)
, m_session(session)
, m_backends(backends)
, m_completed(0)
, m_packet_num(0)
, m_query(NULL)
{
}
@ -96,8 +96,8 @@ void CatSession::clientReply(GWBUF* pPacket, DCB* pDcb)
{
send = backend->get_reply_state() != REPLY_STATE_DONE;
}
else if (backend->get_reply_state() == REPLY_STATE_RSET_ROWS &&
mxs_mysql_get_command(pPacket) != MYSQL_REPLY_EOF)
else if (backend->get_reply_state() == REPLY_STATE_RSET_ROWS
&& mxs_mysql_get_command(pPacket) != MYSQL_REPLY_EOF)
{
send = true;
}

12
server/modules/routing/cat/catsession.hh
View File

@ -10,7 +10,7 @@
* of this software will be governed by version 2 or later of the General
* Public License.
*/
#pragma once
#pragma once
#include "cat.hh"
@ -21,10 +21,10 @@ class Cat;
/**
* The client session structure used within this router.
*/
class CatSession: public mxs::RouterSession
class CatSession : public mxs::RouterSession
{
CatSession(const CatSession&) = delete;
CatSession& operator =(const CatSession&) = delete;
CatSession& operator=(const CatSession&) = delete;
public:
CatSession(MXS_SESSION* session, Cat* router, mxs::SRWBackendList& backends);
@ -64,10 +64,10 @@ public:
* @param action The context.
* @param pSuccess On output, if false, the session will be terminated.
*/
void handleError(GWBUF* pMessage,
DCB* pProblem,
void handleError(GWBUF* pMessage,
DCB* pProblem,
mxs_error_action_t action,
bool* pSuccess);
bool* pSuccess);
private:
MXS_SESSION* m_session;