diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 00:55:06 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 00:55:06 +0000 |
| commit | 59d9255501da74b05fdab96a8cf1e3e67c6e90f4 (patch) | |
| tree | d21c8b0372048ded3b7cc55f84a6db6b661b09ac /res/res_config_pgsql.c | |
| parent | e9fe1993bd8fd17e52954a82ad66c9229a1a5703 (diff) | |
Fix some usages of snprintf, and clarify a couple variable names.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@129864 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_config_pgsql.c')
| -rw-r--r-- | res/res_config_pgsql.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index fe582f9d8..20be04a3d 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -1329,7 +1329,7 @@ static char *handle_cli_realtime_pgsql_cache(struct ast_cli_entry *e, int cmd, s static char *handle_cli_realtime_pgsql_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - char status[256], status2[100] = ""; + char status[256], credentials[100] = ""; int ctime = time(NULL) - connect_time; switch (cmd) { @@ -1348,31 +1348,31 @@ static char *handle_cli_realtime_pgsql_status(struct ast_cli_entry *e, int cmd, if (pgsqlConn && PQstatus(pgsqlConn) == CONNECTION_OK) { if (!ast_strlen_zero(dbhost)) - snprintf(status, 255, "Connected to %s@%s, port %d", dbname, dbhost, dbport); + snprintf(status, sizeof(status), "Connected to %s@%s, port %d", dbname, dbhost, dbport); else if (!ast_strlen_zero(dbsock)) - snprintf(status, 255, "Connected to %s on socket file %s", dbname, dbsock); + snprintf(status, sizeof(status), "Connected to %s on socket file %s", dbname, dbsock); else - snprintf(status, 255, "Connected to %s@%s", dbname, dbhost); + snprintf(status, sizeof(status), "Connected to %s@%s", dbname, dbhost); if (!ast_strlen_zero(dbuser)) - snprintf(status2, 99, " with username %s", dbuser); + snprintf(credentials, sizeof(credentials), " with username %s", dbuser); if (ctime > 31536000) ast_cli(a->fd, "%s%s for %d years, %d days, %d hours, %d minutes, %d seconds.\n", - status, status2, ctime / 31536000, (ctime % 31536000) / 86400, + status, credentials, ctime / 31536000, (ctime % 31536000) / 86400, (ctime % 86400) / 3600, (ctime % 3600) / 60, ctime % 60); else if (ctime > 86400) ast_cli(a->fd, "%s%s for %d days, %d hours, %d minutes, %d seconds.\n", status, - status2, ctime / 86400, (ctime % 86400) / 3600, (ctime % 3600) / 60, + credentials, ctime / 86400, (ctime % 86400) / 3600, (ctime % 3600) / 60, ctime % 60); else if (ctime > 3600) - ast_cli(a->fd, "%s%s for %d hours, %d minutes, %d seconds.\n", status, status2, + ast_cli(a->fd, "%s%s for %d hours, %d minutes, %d seconds.\n", status, credentials, ctime / 3600, (ctime % 3600) / 60, ctime % 60); else if (ctime > 60) - ast_cli(a->fd, "%s%s for %d minutes, %d seconds.\n", status, status2, ctime / 60, + ast_cli(a->fd, "%s%s for %d minutes, %d seconds.\n", status, credentials, ctime / 60, ctime % 60); else - ast_cli(a->fd, "%s%s for %d seconds.\n", status, status2, ctime); + ast_cli(a->fd, "%s%s for %d seconds.\n", status, credentials, ctime); return CLI_SUCCESS; } else { |