diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-07 00:52:23 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-07 00:52:23 +0000 |
| commit | 778b3d88a77fcfbb20d0d3c57b88196a85583fdb (patch) | |
| tree | ce48e87a87be1a1f3a282b73097a36a25d77b39d /cdr/cdr_pgsql.c | |
| parent | b7a4db0ced614b2a619a02227883528a7bb0a1a6 (diff) | |
More from the resolve-shadow-warnings branch. This time the cdr/ directory.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cdr/cdr_pgsql.c')
| -rw-r--r-- | cdr/cdr_pgsql.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index e4d9b692c..3f518cc4d 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -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); |