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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
29c00f41
Commit
29c00f41
authored
Nov 12, 2014
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
logger: add vlogger with va_list
Change-Id: I4203235cd16eec796ecd020ecfe06e9b8107fc10
parent
a988a186
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/logger.c
+9
-6
9 additions, 6 deletions
daemon/src/logger.c
daemon/src/logger.h
+3
-0
3 additions, 0 deletions
daemon/src/logger.h
with
12 additions
and
6 deletions
daemon/src/logger.c
+
9
−
6
View file @
29c00f41
...
@@ -44,6 +44,15 @@ void logger(const int level, const char* format, ...)
...
@@ -44,6 +44,15 @@ void logger(const int level, const char* format, ...)
return
;
return
;
va_list
ap
;
va_list
ap
;
va_start
(
ap
,
format
);
vlogger
(
level
,
format
,
ap
);
va_end
(
ap
);
}
void
vlogger
(
const
int
level
,
const
char
*
format
,
va_list
ap
)
{
if
(
!
debugMode
&&
level
==
LOG_DEBUG
)
return
;
if
(
consoleLog
)
{
if
(
consoleLog
)
{
const
char
*
color_prefix
=
""
;
const
char
*
color_prefix
=
""
;
...
@@ -58,16 +67,10 @@ void logger(const int level, const char* format, ...)
...
@@ -58,16 +67,10 @@ void logger(const int level, const char* format, ...)
}
}
fputs
(
color_prefix
,
stderr
);
fputs
(
color_prefix
,
stderr
);
va_start
(
ap
,
format
);
vfprintf
(
stderr
,
format
,
ap
);
vfprintf
(
stderr
,
format
,
ap
);
va_end
(
ap
);
fputs
(
END_COLOR
"
\n
"
,
stderr
);
fputs
(
END_COLOR
"
\n
"
,
stderr
);
}
else
{
}
else
{
va_start
(
ap
,
format
);
vsyslog
(
level
,
format
,
ap
);
vsyslog
(
level
,
format
,
ap
);
va_end
(
ap
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
daemon/src/logger.h
+
3
−
0
View file @
29c00f41
...
@@ -35,10 +35,13 @@
...
@@ -35,10 +35,13 @@
extern
"C"
{
extern
"C"
{
#endif
#endif
#include
<stdarg.h>
/**
/**
* Print something, coloring it depending on the level
* Print something, coloring it depending on the level
*/
*/
void
logger
(
const
int
level
,
const
char
*
format
,
...);
void
logger
(
const
int
level
,
const
char
*
format
,
...);
void
vlogger
(
const
int
level
,
const
char
*
format
,
va_list
);
/**
/**
* Allow writing on the console
* Allow writing on the console
...
...
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