kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-05-04 17:19:25 -07:00
parent 1b30061a4d
commit 2786631e3b
5 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ixwebsocket/IXHttpClient.cpp
View File

@@ -241,8 +241,7 @@ namespace ix
} }
// Make a new cancellation object dealing with transfer timeout // Make a new cancellation object dealing with transfer timeout
isCancellationRequested = isCancellationRequested = makeCancellationRequestWithTimeout(args->transferTimeout, _stop);
makeCancellationRequestWithTimeout(args->transferTimeout, _stop);
if (args->verbose) if (args->verbose)
{ {

10
test/IXCobraToSentryBotTest.cpp
View File

@@ -159,14 +159,8 @@ TEST_CASE("Cobra_to_sentry_bot", "[cobra_bots]")
// Only run the bot for 3 seconds // Only run the bot for 3 seconds
int runtime = 3; int runtime = 3;
int64_t sentCount = cobra_to_sentry_bot(config, int64_t sentCount = cobra_to_sentry_bot(
channel, config, channel, filter, position, sentryClient, verbose, enableHeartbeat, runtime);
filter,
position,
sentryClient,
verbose,
enableHeartbeat,
runtime);
// //
// We want at least 2 messages to be sent // We want at least 2 messages to be sent
// //

10
test/IXCobraToStdoutBotTest.cpp
View File

@@ -96,14 +96,8 @@ TEST_CASE("Cobra_to_stdout_bot", "[cobra_bots]")
// We could try to capture the output ... not sure how. // We could try to capture the output ... not sure how.
bool fluentd = true; bool fluentd = true;
int64_t sentCount = ix::cobra_to_stdout_bot(config, int64_t sentCount = ix::cobra_to_stdout_bot(
channel, config, channel, filter, position, fluentd, quiet, enableHeartbeat, runtime);
filter,
position,
fluentd,
quiet,
enableHeartbeat,
runtime);
// //
// We want at least 2 messages to be sent // We want at least 2 messages to be sent
// //

2
test/IXGetFreePort.cpp
View File

@@ -4,7 +4,7 @@
* Copyright (c) 2019 Machine Zone. All rights reserved. * Copyright (c) 2019 Machine Zone. All rights reserved.
*/ */
// Using inet_addr will trigger an error on uwp without this // Using inet_addr will trigger an error on uwp without this
// FIXME: use a different api // FIXME: use a different api
#ifdef _WIN32 #ifdef _WIN32
#ifndef _WINSOCK_DEPRECATED_NO_WARNINGS #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS

12
ws/ws.cpp
View File

@@ -19,8 +19,8 @@
#include <ixwebsocket/IXNetSystem.h> #include <ixwebsocket/IXNetSystem.h>
#include <ixwebsocket/IXSocket.h> #include <ixwebsocket/IXSocket.h>
#include <ixwebsocket/IXUserAgent.h> #include <ixwebsocket/IXUserAgent.h>
#include <spdlog/spdlog.h>
#include <spdlog/sinks/basic_file_sink.h> #include <spdlog/sinks/basic_file_sink.h>
#include <spdlog/spdlog.h>
#include <sstream> #include <sstream>
#include <string> #include <string>
@@ -522,14 +522,8 @@ int main(int argc, char** argv)
else if (app.got_subcommand("cobra_subscribe")) else if (app.got_subcommand("cobra_subscribe"))
{ {
bool enableHeartbeat = true; bool enableHeartbeat = true;
int64_t sentCount = ix::cobra_to_stdout_bot(cobraConfig, int64_t sentCount = ix::cobra_to_stdout_bot(
channel, cobraConfig, channel, filter, position, fluentd, quiet, enableHeartbeat, runtime);
filter,
position,
fluentd,
quiet,
enableHeartbeat,
runtime);
ret = (int) sentCount; ret = (int) sentCount;
} }
else if (app.got_subcommand("cobra_publish")) else if (app.got_subcommand("cobra_publish"))