kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 16:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 159818 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r159818 | kpfleming | 2008-11-29 11:57:39 -0600 (Sat, 29 Nov 2008) | 18 lines
  
  incorporates r159808 from branches/1.4:
  ------------------------------------------------------------------------
  r159808 | kpfleming | 2008-11-29 10:58:29 -0600 (Sat, 29 Nov 2008) | 7 lines
  
  update dev-mode compiler flags to match the ones used by default on Ubuntu Intrepid, so all developers will see the same warnings and errors
  
  since this branch already had some printf format attributes, enable checking for them and tag functions that didn't have them
  
  format attributes in a consistent way
  
  
  ------------------------------------------------------------------------
  
  in addition:
  
  move some format attributes from main/utils.c to the header files they belong in, and fix up references to the relevant functions based on new compiler warnings
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@159855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-29 18:37:55 +00:00
parent f798f236fb
commit 2eb5c30a3a
41 changed files with 179 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
res/res_config_sqlite.c
View File

@@ -77,7 +77,6 @@
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sqlite.h>
#include "asterisk/logger.h"
@@ -524,46 +523,46 @@ static char *sql_create_cdr_table =
");";
/*! SQL query format to insert a CDR entry. */
static char *sql_add_cdr_entry =
"INSERT INTO '%q' ("
" clid,"
" src,"
" dst,"
" dcontext,"
" channel,"
" dstchannel,"
" lastapp,"
" lastdata,"
" start,"
" answer,"
" end,"
" duration,"
" billsec,"
" disposition,"
" amaflags,"
" accountcode,"
" uniqueid,"
" userfield"
") VALUES ("
" '%q',"
" '%q',"
" '%q',"
" '%q',"
" '%q',"
" '%q',"
" '%q',"
" '%q',"
" datetime(%d,'unixepoch','localtime'),"
" datetime(%d,'unixepoch','localtime'),"
" datetime(%d,'unixepoch','localtime'),"
" '%ld',"
" '%ld',"
" '%ld',"
" '%ld',"
" '%q',"
" '%q',"
" '%q'"
");";
#define sql_add_cdr_entry \
"INSERT INTO '%q' (" \
" clid," \
" src," \
" dst," \
" dcontext," \
" channel," \
" dstchannel," \
" lastapp," \
" lastdata," \
" start," \
" answer," \
" end," \
" duration," \
" billsec," \
" disposition," \
" amaflags," \
" accountcode," \
" uniqueid," \
" userfield" \
") VALUES (" \
" '%q'," \
" '%q'," \
" '%q'," \
" '%q'," \
" '%q'," \
" '%q'," \
" '%q'," \
" '%q'," \
" datetime(%d,'unixepoch','localtime')," \
" datetime(%d,'unixepoch','localtime')," \
" datetime(%d,'unixepoch','localtime')," \
" '%ld'," \
" '%ld'," \
" '%ld'," \
" '%ld'," \
" '%q'," \
" '%q'," \
" '%q'" \
");"
/*!
* SQL query format to fetch the static configuration of a file.
@@ -571,11 +570,11 @@ static char *sql_add_cdr_entry =
*
* \see add_cfg_entry()
*/
static char *sql_get_config_table =
"SELECT *"
" FROM '%q'"
" WHERE filename = '%q' AND commented = 0"
" ORDER BY cat_metric ASC, var_metric ASC;";
#define sql_get_config_table \
"SELECT *" \
" FROM '%q'" \
" WHERE filename = '%q' AND commented = 0" \
" ORDER BY cat_metric ASC, var_metric ASC;"
static int set_var(char **var, const char *name, const char *value)
{