diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-29 18:16:50 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-29 18:16:50 +0000 |
| commit | 3689550c486c5e276beeaf95e5c33ab592cbc34e (patch) | |
| tree | 5461d0c5a948ae2f6feea7e7786ed1c5a065114b /res | |
| parent | e290ab7c41a52dde5b4d806dd1d5c5ffde50c8bc (diff) | |
Merged revisions 159818 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@159851 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_config_sqlite.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index c39629925..a7bf62cef 100644 --- a/res/res_config_sqlite.c +++ b/res/res_config_sqlite.c @@ -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) { |