[asterisk-commits] russell: branch russell/cdr-q r249059 - in /team/russell/cdr-q: ./ cdr/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Feb 26 02:46:41 CST 2010
Author: russell
Date: Fri Feb 26 02:46:38 2010
New Revision: 249059
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249059
Log:
sync to trunk
Modified:
team/russell/cdr-q/ (props changed)
team/russell/cdr-q/cdr/cdr_csv.c
team/russell/cdr-q/cdr/cdr_manager.c
team/russell/cdr-q/cdr/cdr_odbc.c
team/russell/cdr-q/cdr/cdr_pgsql.c
team/russell/cdr-q/cdr/cdr_radius.c
team/russell/cdr-q/cdr/cdr_sqlite.c
team/russell/cdr-q/cdr/cdr_sqlite3_custom.c
team/russell/cdr-q/cdr/cdr_syslog.c
team/russell/cdr-q/cdr/cdr_tds.c
Propchange: team/russell/cdr-q/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 26 02:46:38 2010
@@ -1,1 +1,1 @@
-/trunk:1-249056
+/trunk:1-249058
Modified: team/russell/cdr-q/cdr/cdr_csv.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_csv.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_csv.c (original)
+++ team/russell/cdr-q/cdr/cdr_csv.c Fri Feb 26 02:46:38 2010
@@ -18,8 +18,8 @@
* at the top of the source tree.
*/
-/*! \file
- *
+/*!
+ * \file
* \brief Comma Separated Value CDR records.
*
* \author Mark Spencer <markster at digium.com>
@@ -49,7 +49,7 @@
static int loguniqueid = 0;
static int loguserfield = 0;
static int loaded = 0;
-static char *config = "cdr.conf";
+static const char config[] = "cdr.conf";
/* #define CSV_LOGUNIQUEID 1 */
/* #define CSV_LOGUSERFIELD 1 */
Modified: team/russell/cdr-q/cdr/cdr_manager.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_manager.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_manager.c (original)
+++ team/russell/cdr-q/cdr/cdr_manager.c Fri Feb 26 02:46:38 2010
@@ -14,8 +14,8 @@
* at the top of the source tree.
*/
-/*! \file
- *
+/*!
+ * \file
* \brief Asterisk Call Manager CDR records.
*
* See also
@@ -43,7 +43,7 @@
#define CONF_FILE "cdr_manager.conf"
#define CUSTOM_FIELDS_BUF_SIZE 1024
-static char *name = "cdr_manager";
+static const char name[] = "cdr_manager";
static int enablecdr = 0;
Modified: team/russell/cdr-q/cdr/cdr_odbc.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_odbc.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_odbc.c (original)
+++ team/russell/cdr-q/cdr/cdr_odbc.c Fri Feb 26 02:46:38 2010
@@ -16,8 +16,8 @@
* at the top of the source tree.
*/
-/*! \file
- *
+/*!
+ * \file
* \brief ODBC CDR Backend
*
* \author Brian K. West <brian at bkw.org>
Modified: team/russell/cdr-q/cdr/cdr_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_pgsql.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_pgsql.c (original)
+++ team/russell/cdr-q/cdr/cdr_pgsql.c Fri Feb 26 02:46:38 2010
@@ -20,8 +20,8 @@
* at the top of the source tree.
*/
-/*! \file
- *
+/*!
+ * \file
* \brief PostgreSQL CDR logger
*
* \author Matthew D. Hardeman <mhardemn at papersoft.com>
Modified: team/russell/cdr-q/cdr/cdr_radius.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_radius.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_radius.c (original)
+++ team/russell/cdr-q/cdr/cdr_radius.c Fri Feb 26 02:46:38 2010
@@ -16,9 +16,10 @@
* at the top of the source tree.
*/
-/*! \file
- *
+/*!
+ * \file
* \brief RADIUS CDR Support
+ *
* \author Philippe Sultan
* \extref The Radius Client Library - http://developer.berlios.de/projects/radiusclient-ng/
*
@@ -34,7 +35,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <time.h>
#include <radiusclient-ng.h>
#include "asterisk/channel.h"
@@ -79,9 +79,9 @@
RADIUS_FLAG_ENABLED = (1 << 3),
};
-static char *desc = "RADIUS CDR Backend";
-static char *name = "radius";
-static char *cdr_config = "cdr.conf";
+static const char desc[] = "RADIUS CDR Backend";
+static const char name[] = "radius";
+static const char cdr_config[] = "cdr.conf";
static char radiuscfg[PATH_MAX] = "/etc/radiusclient-ng/radiusclient.conf";
Modified: team/russell/cdr-q/cdr/cdr_sqlite.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_sqlite.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_sqlite.c (original)
+++ team/russell/cdr-q/cdr/cdr_sqlite.c Fri Feb 26 02:46:38 2010
@@ -55,7 +55,7 @@
/* When you change the DATE_FORMAT, be sure to change the CHAR(19) below to something else */
#define DATE_FORMAT "%Y-%m-%d %T"
-static char *name = "sqlite";
+static const char name[] = "sqlite";
static sqlite* db = NULL;
AST_MUTEX_DEFINE_STATIC(sqlite_lock);
Modified: team/russell/cdr-q/cdr/cdr_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_sqlite3_custom.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_sqlite3_custom.c (original)
+++ team/russell/cdr-q/cdr/cdr_sqlite3_custom.c Fri Feb 26 02:46:38 2010
@@ -16,8 +16,8 @@
* at the top of the source tree.
*/
-/*! \file
- *
+/*!
+ * \file
* \brief Custom SQLite3 CDR records.
*
* \author Adapted by Alejandro Rios <alejandro.rios at avatar.com.co> and
Modified: team/russell/cdr-q/cdr/cdr_syslog.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_syslog.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_syslog.c (original)
+++ team/russell/cdr-q/cdr/cdr_syslog.c Fri Feb 26 02:46:38 2010
@@ -16,9 +16,10 @@
* at the top of the source tree.
*/
-/*! \file cdr_syslog.c
- *
+/*!
+ * \file
* \brief syslog CDR logger
+ *
* \author Sean Bright <sean at malleable.com>
*
* See also
Modified: team/russell/cdr-q/cdr/cdr_tds.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/cdr-q/cdr/cdr_tds.c?view=diff&rev=249059&r1=249058&r2=249059
==============================================================================
--- team/russell/cdr-q/cdr/cdr_tds.c (original)
+++ team/russell/cdr-q/cdr/cdr_tds.c Fri Feb 26 02:46:38 2010
@@ -24,7 +24,8 @@
* \ingroup cdr_drivers
*/
-/*! \verbatim
+/*!
+ * \verbatim
*
* Table Structure for `cdr`
*
@@ -74,8 +75,8 @@
#define DATE_FORMAT "%Y/%m/%d %T"
-static char *name = "FreeTDS (MSSQL)";
-static char *config = "cdr_tds.conf";
+static const char name[] = "FreeTDS (MSSQL)";
+static const char config[] = "cdr_tds.conf";
struct cdr_tds_config {
AST_DECLARE_STRING_FIELDS(
More information about the asterisk-commits
mailing list