diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-10 19:35:50 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-10 19:35:50 +0000 |
| commit | b69c8e6ab5b5d20a964d67e93cda8dc07da61fa4 (patch) | |
| tree | b4d1b3f66cf87177cb1c8a8ee596b6a9458f8f6c /main/callerid.c | |
| parent | 3ffb39833b25a02108214d7584733bc6b9c334df (diff) | |
Another big chunk of changes from the RSW branch. Bunch of stuff from main/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/callerid.c')
| -rw-r--r-- | main/callerid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/callerid.c b/main/callerid.c index 1d5ae047e..1fcd325ce 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -722,14 +722,14 @@ void callerid_free(struct callerid_state *cid) static int callerid_genmsg(char *msg, int size, const char *number, const char *name, int flags) { - struct timeval tv = ast_tvnow(); + struct timeval now = ast_tvnow(); struct ast_tm tm; char *ptr; int res; int i, x; /* Get the time */ - ast_localtime(&tv, &tm, NULL); + ast_localtime(&now, &tm, NULL); ptr = msg; |