diff options
Diffstat (limited to 'mg_tools.c')
| -rw-r--r-- | mg_tools.c | 87 |
1 files changed, 42 insertions, 45 deletions
@@ -1,15 +1,11 @@ -/*******************************************************************/ -/*! \file muggle_tools.cpp - * \brief A few util functions for standalone and plugin messaging - * for the vdr muggle plugindatabase - ******************************************************************** - * \version $Revision: 1.3 $ - * \date $Date: 2004/07/25 21:33:35 $ +/*! \file mg_tools.c + * \brief A few util functions for standalone and plugin messaging for the vdr muggle plugindatabase + * + * \version $Revision: 1.4 $ + * \date $Date: 2004/08/29 14:39:33 $ * \author Ralf Klueber, Lars von Wedel, Andreas Kellner * \author file owner: $Author: lvw $ - * */ -/*******************************************************************/ #include "mg_tools.h" @@ -18,11 +14,12 @@ extern "C" #include <stdarg.h> #include <stdio.h> } -#include <stdlib.h> +#include <stdlib.h> #define MAX_BUFLEN 2048 #define MAX_QUERY_BUFLEN 2048 + static char buffer[MAX_BUFLEN]; static char querybuf[MAX_QUERY_BUFLEN]; @@ -68,22 +65,20 @@ void mgWarning(const char *fmt, ...) { va_list ap; - - va_start(ap, fmt); - + va_start(ap, fmt); vsnprintf(buffer, MAX_BUFLEN-1, fmt, ap); + if(STANDALONE) { fprintf(stderr, "warning: %s\n", buffer); } else - { + { #if !STANDALONE - isyslog( "Warning: %s\n", buffer); + isyslog( "Warning: %s\n", buffer); #endif - - } - + } + va_end(ap); } @@ -91,58 +86,60 @@ void mgError(const char *fmt, ...) { va_list ap; - - va_start(ap, fmt); - + va_start(ap, fmt); vsnprintf(buffer, MAX_BUFLEN-1, fmt, ap); + if(STANDALONE) - { - fprintf(stderr, "Error: %s\n", buffer); - exit(1); - } + { + fprintf(stderr, "Error: %s\n", buffer); + exit(1); + } else - { + { #if !STANDALONE - isyslog( "Error in Muggle: %s\n", buffer); + isyslog( "Error in Muggle: %s\n", buffer); #endif - } + } va_end(ap); } MYSQL_RES* mgSqlReadQuery(MYSQL *db, const char *fmt, ...) { - va_list ap; - va_start( ap, fmt ); - vsnprintf( querybuf, MAX_QUERY_BUFLEN-1, fmt, ap ); - - mgDebug(9, "mgSqlReadQuery: SQL query: '%s'", querybuf); + va_list ap; + va_start( ap, fmt ); + vsnprintf( querybuf, MAX_QUERY_BUFLEN-1, fmt, ap ); - if( mysql_query(db, querybuf) ) + if( mysql_query(db, querybuf) ) { - mgError("SQL error in MUGGLE\n%s\n", querybuf); + mgError( "SQL error in MUGGLE:\n%s\n", querybuf ); } - - MYSQL_RES *result = mysql_store_result(db); - - return result; + + MYSQL_RES *result = mysql_store_result(db); + + va_end(ap); + return result; } void mgSqlWriteQuery(MYSQL *db, const char *fmt, ...) { - va_list ap; - - va_start(ap, fmt); + va_list ap; + va_start(ap, fmt); + vsnprintf(querybuf, MAX_QUERY_BUFLEN-1, fmt, ap); - vsnprintf(querybuf, MAX_QUERY_BUFLEN-1, fmt, ap); - if(mysql_query(db,querybuf)) + if( mysql_query(db, querybuf) ) { - mgError("SQL error in MUGGLE\n%s\n", querybuf); + mgError( "SQL error in MUGGLE:\n%s\n", querybuf ); } + + va_end(ap); } /* -------------------- begin CVS log --------------------------------- * $Log: mg_tools.c,v $ + * Revision 1.4 2004/08/29 14:39:33 lvw + * Import running in basic version + * * Revision 1.3 2004/07/25 21:33:35 lvw * Removed bugs in finding track files and playlist indexing. * |