diff options
| author | George Joseph <george.joseph@fairview5.com> | 2016-02-01 12:04:06 -0700 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2016-02-01 19:22:40 -0600 |
| commit | 40da6434c1189e2557d20ea3871761cb34595257 (patch) | |
| tree | 5337e33a26badb1830c26153a87186e7d1bcecaa /addons | |
| parent | 52b29f9b4cd373be7357cd03e01cfeb2d0029140 (diff) | |
build_system: Fix some warnings highlighted by clang
Fix some warnings found with clang.
Change-Id: I5195b6189b148c2ee3ed4a19d015a6d4ef3e77bd
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/res_config_mysql.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c index a805cb4b4..c9fa7c744 100644 --- a/addons/res_config_mysql.c +++ b/addons/res_config_mysql.c @@ -1518,7 +1518,7 @@ static int load_mysql_config(struct ast_config *config, const char *category, st ast_debug(1, "MySQL RealTime database name: %s\n", conn->name); ast_debug(1, "MySQL RealTime user: %s\n", conn->user); ast_debug(1, "MySQL RealTime password: %s\n", conn->pass); - if(conn->charset) + if(!ast_strlen_zero(conn->charset)) ast_debug(1, "MySQL RealTime charset: %s\n", conn->charset); return 1; @@ -1533,13 +1533,13 @@ static int mysql_reconnect(struct mysql_conn *conn) /* mutex lock should have been locked before calling this function. */ reconnect_tryagain: - if ((!conn->connected) && (!ast_strlen_zero(conn->host) || conn->sock) && !ast_strlen_zero(conn->user) && !ast_strlen_zero(conn->name)) { + if ((!conn->connected) && (!ast_strlen_zero(conn->host) || !ast_strlen_zero(conn->sock)) && !ast_strlen_zero(conn->user) && !ast_strlen_zero(conn->name)) { if (!mysql_init(&conn->handle)) { ast_log(LOG_WARNING, "MySQL RealTime: Insufficient memory to allocate MySQL resource.\n"); conn->connected = 0; return 0; } - if(conn->charset && strlen(conn->charset) > 2){ + if(strlen(conn->charset) > 2){ char set_names[255]; char statement[512]; snprintf(set_names, sizeof(set_names), "SET NAMES %s", conn->charset); |