[Freeswitch-branches] [commit] r10308 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax

[FreeSWITCH SVN]

Author: gmaruzz
Date: Mon Nov 10 01:15:10 2008
New Revision: 10308

Log:
skypiax: better logging

Modified:
   freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c

Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c
==============================================================================
--- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c	(original)
+++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c	Mon Nov 10 01:15:10 2008
@@ -16,8 +16,8 @@
 #define NOTICA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, 		"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][NOTICA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
 
 
-#define SKYPIAX_P_LOG NULL, (unsigned long)55, __LINE__, "none", -1,  -2, -3
-#define SKYPIAX_TMP_LOG NULL, (unsigned long)55, __LINE__, "none", -1,  -2, -3
+//#define SKYPIAX_P_LOG p ? p->owner : NULL, (unsigned long)pthread_self(), __LINE__, p ? p->name ? p->name : "none" : "none", p ? p->owner ? p->owner->_state : -1 : -1,  p ? p->interface_state : -1, p ? p->skype_callflow : -1
+#define SKYPIAX_P_LOG NULL, (unsigned long)55, __LINE__, p ? p->name ? p->name : "none" : "none", -1, p ? p->interface_state : -1, p ? p->skype_callflow : -1
 
 
 /*********************************/
@@ -886,7 +886,7 @@
 int X11_errors_handler(Display * dpy, XErrorEvent * err)
 {
   (void) dpy;
-  //struct skypiax_pvt *p = NULL;
+  struct skypiax_config *p = NULL;
 
   xerror = err->error_code;
   DEBUGA_SKYPE("Received error code %d from X Server\n", SKYPIAX_P_LOG, xerror);
@@ -912,7 +912,7 @@
   Window w_P;
   Display *disp;
   Window handle_P;
-  //struct skypiax_pvt *p = NULL;
+  struct skypiax_config *p = NULL;
 
   w_P = AsteriskHandlesAst->skype_win;
   disp = AsteriskHandlesAst->disp;
@@ -964,7 +964,7 @@
   unsigned long bytes_after_ret;
   unsigned char *prop;
   int status;
-  //struct skypiax_pvt *p = NULL;
+  struct skypiax_config *p = NULL;
 
   X11_errors_trap();
   //XLockDisplay(disp);
@@ -993,7 +993,7 @@
 
   int *dispptr;
   int disp;
-  //struct skypiax_pvt *p = NULL;
+  struct skypiax_config *p = NULL;
 
   dispptr = data;
   disp = *dispptr;
@@ -1880,6 +1880,7 @@
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load)
 {
+  struct skypiax_config *p = NULL;
 
 	module_pool = pool;