Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
008c7822
Commit
008c7822
authored
6 years ago
by
Adrien Béraud
Committed by
Sébastien Blin
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
clang-tidy: fix issues
Change-Id: I2e7154624ad712b97dfdc2942ab0e924c8c8c306
parent
adafd963
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/account_factory.h
+2
-4
2 additions, 4 deletions
src/account_factory.h
src/archiver.cpp
+2
-2
2 additions, 2 deletions
src/archiver.cpp
src/call.cpp
+2
-2
2 additions, 2 deletions
src/call.cpp
src/call.h
+0
-2
0 additions, 2 deletions
src/call.h
with
6 additions
and
10 deletions
src/account_factory.h
+
2
−
4
View file @
008c7822
...
...
@@ -108,13 +108,11 @@ class AccountFactory {
std
::
lock_guard
<
std
::
recursive_mutex
>
lock
(
mutex_
);
std
::
vector
<
std
::
shared_ptr
<
T
>
>
v
;
const
auto
map
=
getMap_
<
T
>
()
;
if
(
map
)
{
if
(
const
auto
map
=
getMap_
<
T
>
()
)
{
v
.
reserve
(
map
->
size
());
for
(
const
auto
&
it
:
*
map
)
v
.
push_back
(
std
::
static_pointer_cast
<
T
>
(
it
.
second
));
}
v
.
shrink_to_fit
();
return
v
;
}
...
...
This diff is collapsed.
Click to expand it.
src/archiver.cpp
+
2
−
2
View file @
008c7822
...
...
@@ -77,7 +77,7 @@ accountToJsonValue(const std::map<std::string, std::string>& details) {
// replace paths by the files content
std
::
ifstream
ifs
(
i
.
second
);
std
::
string
fileContent
((
std
::
istreambuf_iterator
<
char
>
(
ifs
)),
std
::
istreambuf_iterator
<
char
>
());
root
[
i
.
first
]
=
fileContent
;
root
[
i
.
first
]
=
std
::
move
(
fileContent
)
;
}
else
root
[
i
.
first
]
=
i
.
second
;
}
...
...
@@ -95,7 +95,7 @@ exportAccounts(const std::vector<std::string>& accountIDs,
return
EINVAL
;
}
std
::
size_t
found
=
filepath
.
find_last_of
(
DIR_SEPARATOR_
STR
);
std
::
size_t
found
=
filepath
.
find_last_of
(
DIR_SEPARATOR_
CH
);
auto
toDir
=
filepath
.
substr
(
0
,
found
);
auto
filename
=
filepath
.
substr
(
found
+
1
);
...
...
This diff is collapsed.
Click to expand it.
src/call.cpp
+
2
−
2
View file @
008c7822
...
...
@@ -51,7 +51,7 @@ namespace jami {
/// code \a errcode when the predicate return true.
/// The predicate should have <code>bool(Call*) signature</code>.
inline
void
hangupCallsIf
(
Call
::
SubcallSet
callptr_list
,
int
errcode
,
const
std
::
function
<
bool
(
Call
*
)
>&
pred
)
hangupCallsIf
(
const
Call
::
SubcallSet
&
callptr_list
,
int
errcode
,
const
std
::
function
<
bool
(
Call
*
)
>&
pred
)
{
std
::
for_each
(
std
::
begin
(
callptr_list
),
std
::
end
(
callptr_list
),
[
&
](
const
std
::
shared_ptr
<
Call
>&
call_ptr
)
{
...
...
@@ -70,7 +70,7 @@ hangupCallsIf(Call::SubcallSet callptr_list, int errcode, const std::function<bo
///
/// Works as hangupCallsIf() with a predicate that always return true.
inline
void
hangupCalls
(
Call
::
SubcallSet
callptr_list
,
int
errcode
)
hangupCalls
(
const
Call
::
SubcallSet
&
callptr_list
,
int
errcode
)
{
hangupCallsIf
(
callptr_list
,
errcode
,
[](
Call
*
){
return
true
;
});
}
...
...
This diff is collapsed.
Click to expand it.
src/call.h
+
0
−
2
View file @
008c7822
...
...
@@ -345,8 +345,6 @@ class Call : public Recordable, public std::enable_shared_from_this<Call> {
mutable
std
::
recursive_mutex
callMutex_
{};
private
:
friend
void
hangupCallsIf
(
Call
::
SubcallSet
,
int
,
const
std
::
function
<
bool
(
Call
*
)
>&
);
bool
validStateTransition
(
CallState
newState
);
void
checkPendingIM
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment