diff options
| -rw-r--r-- | include/xine.h.in | 6 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index 8026eebd1..3c7582761 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.h.in,v 1.152 2006/09/10 19:33:53 jcdutton Exp $ + * $Id: xine.h.in,v 1.153 2006/09/10 19:50:09 dgp85 Exp $ * * public xine-lib (libxine) interface and documentation * @@ -792,12 +792,12 @@ const char *const *xine_get_log_names(xine_t *self); void xine_log (xine_t *self, int buf, const char *format, ...); void xine_vlog(xine_t *this, int buf, - const char *format, ...); + const char *format, va_list args); #else void xine_log (xine_t *self, int buf, const char *format, ...) __attribute__ ((__format__(printf, 3, 4))); void xine_vlog(xine_t *this, int buf, - const char *format, ...) __attribute__ ((__format__(printf, 3, 0))); + const char *format, va_list args) __attribute__ ((__format__(printf, 3, 0))); #endif /* get log messages of specified section */ diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index a821a3c26..5b7bdd24d 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.330 2006/09/10 19:33:53 jcdutton Exp $ + * $Id: xine.c,v 1.331 2006/09/10 19:50:09 dgp85 Exp $ */ /* @@ -1959,15 +1959,13 @@ void xine_log (xine_t *this, int buf, const char *format, ...) { } } -void xine_vlog(xine_t *this, int buf, const char *format, ...) { - va_list argp; - +void xine_vlog(xine_t *this, int buf, const char *format, + va_list args) +{ if ( ! this->log_buffers[buf] ) this->log_buffers[buf] = _x_new_scratch_buffer(150); - va_start (argp, format); - this->log_buffers[buf]->scratch_printf(this->log_buffers[buf], format, argp); - va_end(argp); + this->log_buffers[buf]->scratch_printf(this->log_buffers[buf], format, args); } const char *const *xine_get_log (xine_t *this, int buf) { |