diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-11-14 15:13:22 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-11-14 15:13:22 +0000 |
| commit | 0f6892419e528b87e5f78304ca4e4ffa75ac58e5 (patch) | |
| tree | 4d13b85101ee91390cedfbdfd9efba5a436b7aea /res | |
| parent | b4839d4d4ae5072ff910a253abcbe474018b67d7 (diff) | |
One more typo in config.c; and missed conversions due to the constifying of ast_variable_new parameters
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_config_sqlite.c | 4 | ||||
| -rw-r--r-- | res/res_jabber.c | 2 | ||||
| -rw-r--r-- | res/res_odbc.c | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index d05a38237..53987cc9a 100644 --- a/res/res_config_sqlite.c +++ b/res/res_config_sqlite.c @@ -215,7 +215,7 @@ struct rt_multi_cfg_entry_args { * \retval 0 on success * \retval 1 if an allocation error occurred */ -static int set_var(char **var, char *name, char *value); +static int set_var(char **var, const char *name, const char *value); /*! * \brief Load the configuration file. @@ -587,7 +587,7 @@ static char *sql_get_config_table = " WHERE filename = '%q' AND commented = 0" " ORDER BY cat_metric ASC, var_metric ASC;"; -static int set_var(char **var, char *name, char *value) +static int set_var(char **var, const char *name, const char *value) { if (*var) ast_free(*var); diff --git a/res/res_jabber.c b/res/res_jabber.c index 464f6a22c..6dfcb9a25 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -2650,7 +2650,7 @@ static int aji_create_client(char *label, struct ast_variable *var, int debug) else if (!strcasecmp(var->name, "autoregister")) ast_set2_flag(client, ast_true(var->value), AJI_AUTOREGISTER); else if (!strcasecmp(var->name, "buddy")) - aji_create_buddy(var->value, client); + aji_create_buddy((char *)var->value, client); else if (!strcasecmp(var->name, "priority")) client->priority = atoi(var->value); else if (!strcasecmp(var->name, "status")) { diff --git a/res/res_odbc.c b/res/res_odbc.c index 0b3887232..8d3a4da0b 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -232,7 +232,8 @@ static int load_odbc_config(void) static char *cfg = "res_odbc.conf"; struct ast_config *config; struct ast_variable *v; - char *cat, *dsn, *username, *password, *sanitysql; + char *cat; + const char *dsn, *username, *password, *sanitysql; int enabled, pooling, limit; int connect = 0, res = 0; struct ast_flags config_flags = { 0 }; @@ -581,7 +582,8 @@ static int reload(void) static char *cfg = "res_odbc.conf"; struct ast_config *config; struct ast_variable *v; - char *cat, *dsn, *username, *password, *sanitysql; + char *cat; + const char *dsn, *username, *password, *sanitysql; int enabled, pooling, limit; int connect = 0, res = 0; struct ast_flags config_flags = { CONFIG_FLAG_FILEUNCHANGED }; |