projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doc: fix invalid usage of doxygen @param command
[platform/upstream/dbus.git]
/
dbus
/
dbus-sysdeps-util-unix.c
diff --git
a/dbus/dbus-sysdeps-util-unix.c
b/dbus/dbus-sysdeps-util-unix.c
index
99888f0
..
6053265
100644
(file)
--- a/
dbus/dbus-sysdeps-util-unix.c
+++ b/
dbus/dbus-sysdeps-util-unix.c
@@
-381,13
+381,13
@@
_dbus_change_to_daemon_user (const char *user,
/**
* Attempt to ensure that the current process can open
/**
* Attempt to ensure that the current process can open
- * at least @limit file descriptors.
+ * at least @
p
limit file descriptors.
*
*
- * If @limit is lower than the current, it will not be
+ * If @
p
limit is lower than the current, it will not be
* lowered. No error is returned if the request can
* not be satisfied.
*
* lowered. No error is returned if the request can
* not be satisfied.
*
- * @
limit N
umber of file descriptors
+ * @
param limit n
umber of file descriptors
*/
void
_dbus_request_file_descriptor_limit (unsigned int limit)
*/
void
_dbus_request_file_descriptor_limit (unsigned int limit)
@@
-428,14
+428,14
@@
_dbus_request_file_descriptor_limit (unsigned int limit)
}
void
}
void
-_dbus_init_system_log (
void
)
+_dbus_init_system_log (
dbus_bool_t is_daemon
)
{
#ifdef HAVE_SYSLOG_H
int logopts = LOG_PID;
#if HAVE_DECL_LOG_PERROR
#ifdef HAVE_SYSTEMD
{
#ifdef HAVE_SYSLOG_H
int logopts = LOG_PID;
#if HAVE_DECL_LOG_PERROR
#ifdef HAVE_SYSTEMD
- if (sd_booted () <= 0)
+ if (
!is_daemon ||
sd_booted () <= 0)
#endif
logopts |= LOG_PERROR;
#endif
#endif
logopts |= LOG_PERROR;
#endif
@@
-477,6
+477,7
@@
_dbus_system_log (DBusSystemLogSeverity severity, const char *msg, ...)
void
_dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args)
{
void
_dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args)
{
+ va_list tmp;
#ifdef HAVE_SYSLOG_H
int flags;
switch (severity)
#ifdef HAVE_SYSLOG_H
int flags;
switch (severity)
@@
-494,14
+495,14
@@
_dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args
return;
}
return;
}
- vsyslog (flags, msg, args);
+ DBUS_VA_COPY (tmp, args);
+ vsyslog (flags, msg, tmp);
+ va_end (tmp);
#endif
#if !defined(HAVE_SYSLOG_H) || !HAVE_DECL_LOG_PERROR
{
/* vsyslog() won't write to stderr, so we'd better do it */
#endif
#if !defined(HAVE_SYSLOG_H) || !HAVE_DECL_LOG_PERROR
{
/* vsyslog() won't write to stderr, so we'd better do it */
- va_list tmp;
-
DBUS_VA_COPY (tmp, args);
fprintf (stderr, "dbus[" DBUS_PID_FORMAT "]: ", _dbus_getpid ());
vfprintf (stderr, msg, tmp);
DBUS_VA_COPY (tmp, args);
fprintf (stderr, "dbus[" DBUS_PID_FORMAT "]: ", _dbus_getpid ());
vfprintf (stderr, msg, tmp);