Skip to content

Commit

Permalink
misc: unify terminology
Browse files Browse the repository at this point in the history
platform → platforms

Change-Id: I99a79c2073e4c9a593fd264f75e22e4e1df1afcc
GitLab: https://git.jami.net/savoirfairelinux/jami-client-qt/issues/1730
  • Loading branch information
ovari committed Nov 27, 2024
1 parent eb6f862 commit 63d5f4b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Packaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ In `extras/packaging`, the `build_packages.sh` script will build packages for su

**Usage:**
```bash
extras/packaging/build_packages.sh -a # -a or --all will build all platform which are known to be supported
extras/packaging/build_packages.sh -u # -u or --ubuntu will build for all supported versions of Ubuntu
extras/packaging/build_packages.sh -u22 -d11 # -u22 will build for ubuntu 22.04 and -d11 will build for Debian 11
extras/packaging/build_packages.sh -a # -a or --all builds all supported platforms
extras/packaging/build_packages.sh -u # -u or --ubuntu builds all supported versions of Ubuntu
extras/packaging/build_packages.sh -u22 -d11 # -u22 builds ubuntu 22.04 and -d11 builds Debian 11
```
6 changes: 3 additions & 3 deletions src/connectionmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ class ConnectionManager::Impl : public std::enable_shared_from_this<ConnectionMa
}
~Impl() {
if (ioContextRunner_) {
if (config_->logger) config_->logger->debug("ConnectionManager: stopping io_context thread");
if (config_->logger) config_->logger->debug("ConnectionManager: Stopping io_context thread");
config_->ioContext->stop();
ioContextRunner_->join();
ioContextRunner_.reset();
Expand Down Expand Up @@ -731,7 +731,7 @@ ConnectionManager::Impl::onResponse(const asio::error_code& ec,
}
if (!info->responseReceived_) {
if (config_->logger)
config_->logger->error("[device {}] no response from DHT to ICE request.", deviceId);
config_->logger->error("[device {}] No response from DHT to ICE request.", deviceId);
info->onConnected_(false);
return;
}
Expand All @@ -745,7 +745,7 @@ ConnectionManager::Impl::onResponse(const asio::error_code& ec,

if (not ice->startIce({sdp.rem_ufrag, sdp.rem_pwd}, std::move(sdp.rem_candidates))) {
if (config_->logger)
config_->logger->warn("[device {}] start ICE failed", deviceId);
config_->logger->warn("[device {}] Start ICE failed", deviceId);
info->onConnected_(false);
return;
}
Expand Down
14 changes: 7 additions & 7 deletions src/ice_transport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ add_stun_server(pj_pool_t& pool, pj_ice_strans_cfg& cfg, const StunServerInfo& i
stun.cfg.max_pkt_size = STUN_MAX_PACKET_SIZE;
stun.conn_type = cfg.stun.conn_type;
if (logger)
logger->debug("added stun server '{}', port {}", pj_strbuf(&stun.server), stun.port);
logger->debug("Added stun server '{}', port {}", pj_strbuf(&stun.server), stun.port);
}

static void
Expand Down Expand Up @@ -330,7 +330,7 @@ add_turn_server(pj_pool_t& pool, pj_ice_strans_cfg& cfg, const TurnServerInfo& i
info.password.size());
}
if (logger)
logger->debug("added turn server '{}', port {}", pj_strbuf(&turn.server), turn.port);
logger->debug("Added turn server '{}', port {}", pj_strbuf(&turn.server), turn.port);
}

//==============================================================================
Expand Down Expand Up @@ -534,7 +534,7 @@ IceTransport::Impl::initIceInstance(const IceTransportOptions& options)

icecb.on_destroy = [](pj_ice_strans* ice_st) {
if (auto* tr = static_cast<Impl*>(pj_ice_strans_get_user_data(ice_st)))
tr->cancelOperations(); // Avoid upper layer to manage this ; Stop read operations
tr->cancelOperations(); // Avoid upper layer to manage this; Stop read operations
};

// Add STUN servers
Expand Down Expand Up @@ -1080,14 +1080,14 @@ IceTransport::Impl::setupGenericReflexiveCandidates()
{
if (not accountLocalAddr_) {
if (logger_)
logger_->warn("[ice:{}] Missing local address, generic srflx candidates wont be generated!",
logger_->warn("[ice:{}] Missing local address, generic srflx candidates unable to be generated!",
fmt::ptr(this));
return {};
}

if (not accountPublicAddr_) {
if (logger_)
logger_->warn("[ice:{}] Missing public address, generic srflx candidates wont be generated!",
logger_->warn("[ice:{}] Missing public address, generic srflx candidates unable to be generated!",
fmt::ptr(this));
return {};
}
Expand Down Expand Up @@ -1340,7 +1340,7 @@ IceTransport::startIce(const Attribute& rem_attrs, std::vector<IceCandidate>&& r

pj_str_t ufrag, pwd;
if (pimpl_->logger_)
pimpl_->logger_->debug("[ice:{}] negotiation starting ({:d} remote candidates)",
pimpl_->logger_->debug("[ice:{}] Negotiation starting ({:d} remote candidates)",
fmt::ptr(pimpl_),
rem_candidates.size());

Expand Down Expand Up @@ -1410,7 +1410,7 @@ IceTransport::startIce(const SDP& sdp)
rem_candidates.data());
if (status != PJ_SUCCESS) {
if (pimpl_->logger_)
pimpl_->logger_->error("[ice:{}] start failed: {:s}", fmt::ptr(pimpl_), sip_utils::sip_strerror(status));
pimpl_->logger_->error("[ice:{}] Start failed: {:s}", fmt::ptr(pimpl_), sip_utils::sip_strerror(status));
pimpl_->is_stopped_ = true;
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/upnp/protocol/pupnp/pupnp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ PUPnP::searchForIgd()
return;
}

if (logger_) logger_->debug("PUPnP: Start search for IGD: attempt {:d}", igdSearchCounter_);
if (logger_) logger_->debug("PUPnP: Start search for IGD. Attempt {:d}", igdSearchCounter_);

// Do not init if the host is not valid. Otherwise, the init will fail
// anyway and may put libupnp in an unstable state (mainly deadlocks)
Expand Down

0 comments on commit 63d5f4b

Please sign in to comment.