Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
121
Issues
121
List
Boards
Labels
Milestones
Security & Compliance
Security & Compliance
Dependency List
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
ae234d24
Commit
ae234d24
authored
Feb 15, 2016
by
Edric Milaret
Committed by
gerrit2
Feb 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove lots of warning during Win32 build
Tuleap:
#381
Change-Id: Ibf1cb1f72f874758d1bd86a5e3a8cd7d6d875fae
parent
7e2bc1e0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
8 deletions
+23
-8
bin/winmain.cpp
bin/winmain.cpp
+4
-0
src/fileutils.cpp
src/fileutils.cpp
+7
-3
src/ip_utils.cpp
src/ip_utils.cpp
+3
-2
src/logger.h
src/logger.h
+3
-1
src/media/socket_pair.cpp
src/media/socket_pair.cpp
+4
-0
src/ringdht/ringaccount.cpp
src/ringdht/ringaccount.cpp
+1
-1
src/security/certstore.cpp
src/security/certstore.cpp
+1
-1
No files found.
bin/winmain.cpp
View file @
ae234d24
...
...
@@ -146,6 +146,8 @@ void
IncomingCall
(
const
std
::
string
&
accountId
,
const
std
::
string
&
callId
,
const
std
::
string
&
message
)
{
(
void
)
accountId
;
(
void
)
message
;
if
(
not
isActive
)
{
DRing
::
accept
(
callId
);
isActive
=
true
;
...
...
@@ -175,6 +177,8 @@ run()
}
DRing
::
fini
();
return
0
;
}
static
void
...
...
src/fileutils.cpp
View file @
ae234d24
...
...
@@ -64,7 +64,9 @@
namespace
ring
{
namespace
fileutils
{
// returns true if directory exists
bool
check_dir
(
const
char
*
path
,
mode_t
dirmode
,
mode_t
parentmode
)
bool
check_dir
(
const
char
*
path
,
mode_t
UNUSED
dirmode
,
mode_t
parentmode
)
{
DIR
*
dir
=
opendir
(
path
);
...
...
@@ -211,7 +213,7 @@ loadFile(const std::string& path)
throw
std
::
runtime_error
(
"Can't read file: "
+
path
);
file
.
seekg
(
0
,
std
::
ios
::
end
);
std
::
streamsize
size
=
file
.
tellg
();
if
(
size
>
std
::
numeric_limits
<
unsigned
>::
max
())
if
(
(
unsigned
)
size
>
std
::
numeric_limits
<
unsigned
>::
max
())
throw
std
::
runtime_error
(
"File is too big: "
+
path
);
buffer
.
resize
(
size
);
file
.
seekg
(
0
,
std
::
ios
::
beg
);
...
...
@@ -221,7 +223,9 @@ loadFile(const std::string& path)
}
void
saveFile
(
const
std
::
string
&
path
,
const
std
::
vector
<
uint8_t
>&
data
,
mode_t
mode
)
saveFile
(
const
std
::
string
&
path
,
const
std
::
vector
<
uint8_t
>&
data
,
mode_t
UNUSED
mode
)
{
std
::
ofstream
file
(
path
,
std
::
ios
::
trunc
|
std
::
ios
::
binary
);
if
(
!
file
.
is_open
())
{
...
...
src/ip_utils.cpp
View file @
ae234d24
...
...
@@ -128,10 +128,11 @@ ip_utils::getInterfaceAddr(const std::string &interface, pj_uint16_t family)
if
(
interface
==
DEFAULT_INTERFACE
)
return
getLocalAddr
(
family
);
const
auto
unix_family
=
family
==
pj_AF_INET
()
?
AF_INET
:
AF_INET6
;
IpAddr
addr
=
{};
#ifndef _WIN32
const
auto
unix_family
=
family
==
pj_AF_INET
()
?
AF_INET
:
AF_INET6
;
int
fd
=
socket
(
unix_family
,
SOCK_DGRAM
,
0
);
if
(
fd
<
0
)
{
RING_ERR
(
"Could not open socket: %m"
);
...
...
@@ -171,7 +172,7 @@ ip_utils::getInterfaceAddr(const std::string &interface, pj_uint16_t family)
DWORD
dwRetval
=
getaddrinfo
(
interface
.
c_str
(),
"0"
,
&
hints
,
&
result
);
if
(
dwRetval
!=
0
)
{
RING_ERR
(
"getaddrinfo failed with error: %
d
"
,
dwRetval
);
RING_ERR
(
"getaddrinfo failed with error: %
lu
"
,
dwRetval
);
return
addr
;
}
...
...
src/logger.h
View file @
ae234d24
...
...
@@ -33,7 +33,9 @@ extern "C" {
* Print something, coloring it depending on the level
*/
void
logger
(
const
int
level
,
const
char
*
format
,
...)
#ifdef __GNUC__
#ifdef _WIN32
__attribute__
((
format
(
gnu_printf
,
2
,
3
)))
#elif defined(__GNUC__)
__attribute__
((
format
(
printf
,
2
,
3
)))
#endif
;
...
...
src/media/socket_pair.cpp
View file @
ae234d24
...
...
@@ -121,7 +121,11 @@ udp_resolve_host(const char* node, int service)
struct
addrinfo
*
res
=
nullptr
;
if
(
auto
error
=
getaddrinfo
(
node
,
sport
,
&
hints
,
&
res
))
{
res
=
nullptr
;
#ifndef _WIN32
RING_ERR
(
"getaddrinfo failed: %s
\n
"
,
gai_strerror
(
error
));
#else
RING_ERR
(
"getaddrinfo failed: %S
\n
"
,
gai_strerror
(
error
));
#endif
}
return
res
;
...
...
src/ringdht/ringaccount.cpp
View file @
ae234d24
...
...
@@ -1216,7 +1216,7 @@ RingAccount::loadValues() const
}
remove
(
file
.
c_str
());
}
RING_DBG
(
"Loaded %
l
u values"
,
values
.
size
());
RING_DBG
(
"Loaded %
z
u values"
,
values
.
size
());
return
values
;
}
...
...
src/security/certstore.cpp
View file @
ae234d24
...
...
@@ -196,7 +196,7 @@ CertificateStore::pinCertificatePath(const std::string& path, std::function<void
}
paths_
.
emplace
(
path
,
std
::
move
(
scerts
));
}
RING_DBG
(
"CertificateStore: loaded %
l
u certificates from %s."
,
RING_DBG
(
"CertificateStore: loaded %
z
u certificates from %s."
,
certs
.
size
(),
path
.
c_str
());
if
(
cb
)
cb
(
ids
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment