Author: mishehu Date: Mon Jul 24 11:15:33 2006 New Revision: 2075 Removed: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/mod_cdr.h Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.h freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/cdrcontainer.cpp Log: Minor cleanup. Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.cpp Mon Jul 24 11:15:33 2006 @@ -28,6 +28,7 @@ #include "basecdr.h" #include <iostream> +#include <string> #include <cstring> #include <switch.h> @@ -69,11 +70,6 @@ memset(ani2,0,80); memset(lastapp,0,80); memset(lastdata,0,255); - /* - memset(accountcode,0,20); - memset(uniqueid,0,32); - memset(userfield,0,255); - */ coresession = newchannel->session; callstartdate= newchannel->timetable->created; Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.h (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/basecdr.h Mon Jul 24 11:15:33 2006 @@ -95,12 +95,6 @@ switch_core_session_t *coresession; std::list<std::pair<std::string,std::string> > chanvars_fixed; std::map<std::string,std::string> chanvars_supp; - /* - This is what happens when you base the ideas off of Asterisk... you end up with an inconvenient asteriskism. - char accountcode[20]; - char uniqueid[32]; - char userfield[255]; - */ bool errorstate; // True if there is an error writing the log }; Modified: freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/branches/mishehu/src/mod/loggers/mod_cdr/cdrcontainer.cpp Mon Jul 24 11:15:33 2006 @@ -43,7 +43,6 @@ switch_xml_t cfg, xml, settings, param; switch_mod_cdr_newchannel_t *newchannel; // = new switch_mod_cdr_newchannel_t; - //memset(newchannel,0,sizeof(*newchannel)); newchannel = 0; if (!(xml = switch_xml_open_cfg(configfile, &cfg, NULL))) @@ -63,9 +62,7 @@ } } - switch_xml_free(xml); - - //delete newchannel; + switch_xml_free(xml); } CDRContainer::~CDRContainer() @@ -74,7 +71,6 @@ process_records(); switch_mod_cdr_newchannel_t *newchannel; //= new switch_mod_cdr_newchannel_t; - //memset(newchannel,0,sizeof(*newchannel)); newchannel = 0; BaseRegistry& registry(BaseRegistry::get()); @@ -87,12 +83,10 @@ } switch_console_printf(SWITCH_CHANNEL_LOG,"mod_cdr shutdown gracefully."); - // delete newchannel; } void CDRContainer::add_cdr(switch_core_session_t *session) { - //switch_channel_t *channel; switch_mod_cdr_newchannel_t *newchannel = new switch_mod_cdr_newchannel_t; memset(newchannel,0,sizeof(*newchannel));