X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/dd60ff8bdd253cd6c24a9c8bbf6bedeecaade99c..d533bdfe8ddee16f067c0d5adadfc8b179de02b6:/src/meta.c

diff --git a/src/meta.c b/src/meta.c
index 889297b..55fff2a 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -16,34 +16,33 @@ faim_export char *aim_getbuildtime(void)
   return AIM_BUILDTIME;
 }
 
-faim_export char *aim_getbuildstring(void)
+faim_export int aim_getbuildstring(char *buf, int buflen)
 {
-  static char string[100];
 
-  snprintf(string, 99, "%d.%d.%d-%s%s", 
+  snprintf(buf, buflen, "%d.%d.%d-%s%s", 
 	   FAIM_VERSION_MAJOR,
 	   FAIM_VERSION_MINOR,
 	   FAIM_VERSION_MINORMINOR,
 	   aim_getbuilddate(),
 	   aim_getbuildtime());
-  return string;
+
+  return 0;
 }
 
-#if debug > 0
-faim_internal void faimdprintf(int dlevel, const char *format, ...)
+faim_internal void faimdprintf(struct aim_session_t *sess, int dlevel, const char *format, ...)
 {
-  if (dlevel >= debug) {
+  if (!sess) {
+    fprintf(stderr, "faimdprintf: no session! boo! (%d, %s)\n", dlevel, format);
+    return;
+  }
+
+  if ((dlevel <= sess->debug) && sess->debugcb) {
     va_list ap;
-    
+
     va_start(ap, format);
-    vfprintf(stderr, format, ap);
+    sess->debugcb(sess, dlevel, format, ap);
     va_end(ap);
   }
+
   return;
 }
-#else
-faim_internal void faimdprintf(int dlevel, const char *format, ...)
-{
-  return;
-}
-#endif