kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

More from the resolve-shadow-warnings branch. This time the cdr/ directory.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-07 00:52:23 +00:00
parent b7a4db0ced
commit 778b3d88a7
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cdr/cdr_pgsql.c
View File

@@ -204,14 +204,14 @@ static int pgsql_log(struct ast_cdr *cdr)
LENGTHEN_BUF2(12);
lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%s", value);
} else if (strncmp(cur->type, "float", 5) == 0) {
struct timeval *tv = cur->name[0] == 'd' ? &cdr->start : &cdr->answer;
struct timeval *when = cur->name[0] == 'd' ? &cdr->start : &cdr->answer;
LENGTHEN_BUF2(30);
lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%f", (double)cdr->end.tv_sec - tv->tv_sec + cdr->end.tv_usec / 1000000.0 - tv->tv_usec / 1000000.0);
lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%f", (double)cdr->end.tv_sec - when->tv_sec + cdr->end.tv_usec / 1000000.0 - when->tv_usec / 1000000.0);
} else {
/* Char field, probably */
struct timeval *tv = cur->name[0] == 'd' ? &cdr->start : &cdr->answer;
struct timeval *when = cur->name[0] == 'd' ? &cdr->start : &cdr->answer;
LENGTHEN_BUF2(30);
lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "'%f'", (double)cdr->end.tv_sec - tv->tv_sec + cdr->end.tv_usec / 1000000.0 - tv->tv_usec / 1000000.0);
lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "'%f'", (double)cdr->end.tv_sec - when->tv_sec + cdr->end.tv_usec / 1000000.0 - when->tv_usec / 1000000.0);
}
} else if (strcmp(cur->name, "disposition") == 0 || strcmp(cur->name, "amaflags") == 0) {
if (strncmp(cur->type, "int", 3) == 0) {
@@ -321,7 +321,7 @@ static int pgsql_log(struct ast_cdr *cdr)
static int unload_module(void)
{
struct columns *cur;
struct columns *current;
ast_cdr_unregister(name);
/* Give all threads time to finish */
@@ -342,8 +342,8 @@ static int unload_module(void)
ast_free(table);
AST_RWLIST_WRLOCK(&psql_columns);
while ((cur = AST_RWLIST_REMOVE_HEAD(&psql_columns, list))) {
ast_free(cur);
while ((current = AST_RWLIST_REMOVE_HEAD(&psql_columns, list))) {
ast_free(current);
}
AST_RWLIST_UNLOCK(&psql_columns);