[svn-commits] mvanbaak: branch 1.6.0 r132278 - in /branches/1.6.0: ./ res/res_config_sqlite.c

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sat Jul 19 05:47:57 2008
New Revision: 132278

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132278
Log:
Merged revisions 132277 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r132277 | mvanbaak | 2008-07-19 12:46:12 +0200 (Sat, 19 Jul 2008) | 7 lines

fix a couple of comments in sqlite resource driver.

(closes issue #13110)
Reported by: gknispel_proformatique
Patches:
      res_config_sqlite_comments.patch uploaded by gknispel (license 261)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_config_sqlite.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_config_sqlite.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_config_sqlite.c?view=diff&rev=132278&r1=132277&r2=132278
==============================================================================
--- branches/1.6.0/res/res_config_sqlite.c (original)
+++ branches/1.6.0/res/res_config_sqlite.c Sat Jul 19 05:47:57 2008
@@ -27,18 +27,12 @@
  * res_config_sqlite is a module for the Asterisk Open Source PBX to
  * support SQLite 2 databases. It can be used to fetch configuration
  * from a database (static configuration files and/or using the Asterisk
- * RealTime Architecture - ARA).
- * It can also be used to log CDR entries. Finally, it can be used for simple
- * queries in the Dialplan. Note that Asterisk already comes with a module
- * named cdr_sqlite. There are two reasons for including it in res_config_sqlite:
+ * RealTime Architecture - ARA).  It can also be used to log CDR entries. 
+ * Note that Asterisk already comes with a module named cdr_sqlite.
+ * There are two reasons for including it in res_config_sqlite:
  * the first is that rewriting it was a training to learn how to write a
  * simple module for Asterisk, the other is to have the same database open for
  * all kinds of operations, which improves reliability and performance.
- *
- * There is already a module for SQLite 3 (named res_sqlite3) in the Asterisk
- * addons. res_config_sqlite was developed because we, at Proformatique, are using
- * PHP 4 in our embedded systems, and PHP 4 has no stable support for SQLite 3
- * at this time. We also needed RealTime support.
  *
  * \section conf_sec Configuration
  *
@@ -324,7 +318,7 @@
 	char **columnNames);
 
 /*!
- * Asterisk callback function for RealTime configuration.
+ * \brief Asterisk callback function for RealTime configuration.
  *
  * Asterisk will call this function each time it requires a variable
  * through the RealTime architecture. ap is a list of parameters and