[libcmyth] Rename occurences of mvp in debug.c/.h to cmyth to match upstream.

3 files changed, 20 insertions, 20 deletions

diff --git a/lib/cmyth/include/debug.h b/lib/cmyth/include/debug.h
index 805964b2e0..e10a5cee44 100644
--- a/lib/cmyth/include/debug.h
+++ b/lib/cmyth/include/debug.h
@@ -2,8 +2,8 @@
  * A C library for generating and controlling debug output
  */
 
-#ifndef __MVP_DEBUG_H
-#define  __MVP_DEBUG_H
+#ifndef __CMYTH_DEBUG_H
+#define  __CMYTH_DEBUG_H
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -13,16 +13,16 @@ typedef struct {
 	int  cur_level;
 	int  (*selector)(int plevel, int slevel);
 	void (*msg_callback)(int level, char *msg);
-} mvp_debug_ctx_t;
+} cmyth_debug_ctx_t;
 
 /**
- * Make a static initializer for an mvp_debug_ctx_t which provides a debug
+ * Make a static initializer for an cmyth_debug_ctx_t which provides a debug
  * context for a subsystem.  This is a macro.
  * \param n subsystem name (a static string is fine)
  * \param l initial debug level for the subsystem
  * \param s custom selector function pointer (NULL is okay)
  */
-#define MVP_DEBUG_CTX_INIT(n,l,s) { n, l, s, NULL }
+#define CMYTH_DEBUG_CTX_INIT(n,l,s) { n, l, s, NULL }
 
 /**
  * Set the debug level to be used for the subsystem
@@ -31,7 +31,7 @@ typedef struct {
  * \return an integer subsystem id used for future interaction
  */
 static inline void
-mvp_dbg_setlevel(mvp_debug_ctx_t *ctx, int level)
+__cmyth_dbg_setlevel(cmyth_debug_ctx_t *ctx, int level)
 {
 	if (ctx != NULL) {
 		ctx->cur_level = level;
@@ -46,7 +46,7 @@ mvp_dbg_setlevel(mvp_debug_ctx_t *ctx, int level)
  * \param ... arguments to the format
  */
 static inline void
-mvp_dbg(mvp_debug_ctx_t *ctx, int level, char *fmt, va_list ap)
+__cmyth_dbg(cmyth_debug_ctx_t *ctx, int level, char *fmt, va_list ap)
 {
 	char msg[4096];
 	int len;
@@ -65,4 +65,4 @@ mvp_dbg(mvp_debug_ctx_t *ctx, int level, char *fmt, va_list ap)
 	}
 }
 
-#endif /*  __MVP_DEBUG_H */
+#endif /*  __CMYTH_DEBUG_H */
diff --git a/lib/cmyth/libcmyth/debug.c b/lib/cmyth/libcmyth/debug.c
index 3bb9db06ee..77b852cf3a 100644
--- a/lib/cmyth/libcmyth/debug.c
+++ b/lib/cmyth/libcmyth/debug.c
@@ -27,9 +27,9 @@
 
 #include "debug.h"
 
-static mvp_debug_ctx_t cmyth_debug_ctx = MVP_DEBUG_CTX_INIT("cmyth",
-							    CMYTH_DBG_NONE,
-							    NULL);
+static cmyth_debug_ctx_t cmyth_debug_ctx = CMYTH_DEBUG_CTX_INIT("cmyth",
+								CMYTH_DBG_NONE,
+								NULL);
 
 /*
  * cmyth_dbg_level(int l)
@@ -49,7 +49,7 @@ static mvp_debug_ctx_t cmyth_debug_ctx = MVP_DEBUG_CTX_INIT("cmyth",
 void
 cmyth_dbg_level(int l)
 {
-	mvp_dbg_setlevel(&cmyth_debug_ctx, l);
+	__cmyth_dbg_setlevel(&cmyth_debug_ctx, l);
 }
 
 /*
@@ -68,7 +68,7 @@ cmyth_dbg_level(int l)
 void
 cmyth_dbg_all()
 {
-	mvp_dbg_setlevel(&cmyth_debug_ctx, CMYTH_DBG_ALL);
+	__cmyth_dbg_setlevel(&cmyth_debug_ctx, CMYTH_DBG_ALL);
 }
 
 /*
@@ -87,7 +87,7 @@ cmyth_dbg_all()
 void
 cmyth_dbg_none()
 {
-	mvp_dbg_setlevel(&cmyth_debug_ctx, CMYTH_DBG_NONE);
+	__cmyth_dbg_setlevel(&cmyth_debug_ctx, CMYTH_DBG_NONE);
 }
 
 /*
@@ -111,7 +111,7 @@ cmyth_dbg(int level, char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	mvp_dbg(&cmyth_debug_ctx, level, fmt, ap);
+	__cmyth_dbg(&cmyth_debug_ctx, level, fmt, ap);
 	va_end(ap);
 }
 
diff --git a/lib/cmyth/librefmem/debug_refmem.c b/lib/cmyth/librefmem/debug_refmem.c
index f7338fa51d..50b09a7cb7 100644
--- a/lib/cmyth/librefmem/debug_refmem.c
+++ b/lib/cmyth/librefmem/debug_refmem.c
@@ -30,7 +30,7 @@
 
 #include "debug.h"
 
-static mvp_debug_ctx_t refmem_debug_ctx = MVP_DEBUG_CTX_INIT("refmem",
+static cmyth_debug_ctx_t refmem_debug_ctx = CMYTH_DEBUG_CTX_INIT("refmem",
 							     REF_DBG_NONE,
 							     NULL);
 /*
@@ -51,7 +51,7 @@ static mvp_debug_ctx_t refmem_debug_ctx = MVP_DEBUG_CTX_INIT("refmem",
 void
 refmem_dbg_level(int l)
 {
-	mvp_dbg_setlevel(&refmem_debug_ctx, l);
+	__cmyth_dbg_setlevel(&refmem_debug_ctx, l);
 }
 
 /*
@@ -70,7 +70,7 @@ refmem_dbg_level(int l)
 void
 refmem_dbg_all()
 {
-	mvp_dbg_setlevel(&refmem_debug_ctx, REF_DBG_ALL);
+	__cmyth_dbg_setlevel(&refmem_debug_ctx, REF_DBG_ALL);
 }
 
 /*
@@ -89,7 +89,7 @@ refmem_dbg_all()
 void
 refmem_dbg_none()
 {
-	mvp_dbg_setlevel(&refmem_debug_ctx, REF_DBG_NONE);
+	__cmyth_dbg_setlevel(&refmem_debug_ctx, REF_DBG_NONE);
 }
 
 /*
@@ -113,6 +113,6 @@ refmem_dbg(int level, char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	mvp_dbg(&refmem_debug_ctx, level, fmt, ap);
+	__cmyth_dbg(&refmem_debug_ctx, level, fmt, ap);
 	va_end(ap);
 }