summaryrefslogtreecommitdiff
path: root/mg_tools.c
diff options
context:
space:
mode:
Diffstat (limited to 'mg_tools.c')
-rw-r--r--mg_tools.c154
1 files changed, 72 insertions, 82 deletions
diff --git a/mg_tools.c b/mg_tools.c
index 02df30b..3a484c5 100644
--- a/mg_tools.c
+++ b/mg_tools.c
@@ -1,4 +1,4 @@
-/*!
+/*!
* \file mg_tools.c
* \brief A few util functions for standalone and plugin messaging for the vdr muggle plugindatabase
*
@@ -12,126 +12,116 @@
/*extern "C"
{*/
- #include <stdarg.h>
- #include <stdio.h>
+#include <stdarg.h>
+#include <stdio.h>
/*}
-*/
+ */
#include <stdlib.h>
+//! \brief buffer for messages
#define MAX_BUFLEN 2048
-#define MAX_QUERY_BUFLEN 2048
static char buffer[MAX_BUFLEN];
-static char querybuf[MAX_QUERY_BUFLEN];
-static int DEBUG_LEVEL=3;
+static int DEBUG_LEVEL = 3;
-void mgSetDebugLevel(int new_level)
+void
+mgSetDebugLevel (int new_level)
{
- DEBUG_LEVEL = new_level;
+ DEBUG_LEVEL = new_level;
}
-void mgDebug(int level, const char *fmt, ...)
+
+void
+mgDebug (int level, const char *fmt, ...)
{
-
- va_list ap;
- if(level <= DEBUG_LEVEL)
- {
- va_start(ap, fmt);
-
- vsnprintf(buffer, MAX_BUFLEN-1, fmt, ap);
- if(STANDALONE)
- {
- fprintf(stderr, "dbg %d: %s\n", level, buffer);
- }
- else
+
+ va_list ap;
+ if (level <= DEBUG_LEVEL)
{
+ va_start (ap, fmt);
+
+ vsnprintf (buffer, MAX_BUFLEN - 1, fmt, ap);
+ if (STANDALONE)
+ {
+ fprintf (stderr, "dbg %d: %s\n", level, buffer);
+ }
+ else
+ {
#if !STANDALONE
- isyslog( "%s\n", buffer);
+ isyslog ("%s\n", buffer);
#endif
+ }
}
- }
- va_end(ap);
+ va_end (ap);
}
-void mgDebug( const char *fmt, ... )
+
+void
+mgDebug (const char *fmt, ...)
{
- va_list ap;
- va_start( ap, fmt );
- mgDebug( 1, fmt, ap );
+ va_list ap;
+ va_start (ap, fmt);
+ mgDebug (1, fmt, ap);
}
-void mgWarning(const char *fmt, ...)
+void
+mgWarning (const char *fmt, ...)
{
-
- va_list ap;
- va_start(ap, fmt);
- vsnprintf(buffer, MAX_BUFLEN-1, fmt, ap);
-
- if(STANDALONE)
- {
- fprintf(stderr, "warning: %s\n", buffer);
- }
- else
+
+ va_list ap;
+ 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);
+
+ va_end (ap);
}
-void mgError(const char *fmt, ...)
+
+void
+mgError (const char *fmt, ...)
{
-
- va_list ap;
- va_start(ap, fmt);
- vsnprintf(buffer, MAX_BUFLEN-1, fmt, ap);
- if(STANDALONE)
+ va_list ap;
+ 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
+ else
{
#if !STANDALONE
- isyslog( "Error in Muggle: %s\n", buffer);
+ isyslog ("Error in Muggle: %s\n", buffer);
#endif
}
- va_end(ap);
+ 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 );
-
- if( mysql_query(db, querybuf) )
- {
- mgError( "SQL error in MUGGLE:\n%s\n", querybuf );
- }
-
- 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);
- vsnprintf(querybuf, MAX_QUERY_BUFLEN-1, fmt, ap);
-
- if( mysql_query(db, querybuf) )
- {
- mgError( "SQL error in MUGGLE:\n%s\n", querybuf );
- }
-
- va_end(ap);
+std::string trim(std::string const& source, char const* delims ) {
+ std::string result(source);
+ std::string::size_type index = result.find_last_not_of(delims);
+ if(index != std::string::npos)
+ result.erase(++index);
+ index = result.find_first_not_of(delims);
+ if(index != std::string::npos)
+ result.erase(0, index);
+ else
+ result.erase();
+ return result;
}