kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-13 13:28:34 +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.1@159851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-29 18:16:50 +00:00
parent 860ef1024a
commit c3347e79a5
45 changed files with 155 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/res_config_sqlite.c
View File

@@ -549,8 +549,7 @@ static char *sql_create_cdr_table =
/*!
* SQL query format to describe the table structure
*/
static char *sql_table_structure =
"SELECT sql FROM sqlite_master WHERE type='table' AND tbl_name='%s'";
#define sql_table_structure "SELECT sql FROM sqlite_master WHERE type='table' AND tbl_name='%s'"
/*!
* SQL query format to fetch the static configuration of a file.
@@ -558,11 +557,11 @@ static char *sql_table_structure =
*
* \see add_cfg_entry()
*/
static const 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 void free_table(struct sqlite_cache_tables *tblptr)
{