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
This commit is contained in:
Sean Bright
2008-08-10 19:35:50 +00:00
parent 3ffb39833b
commit b69c8e6ab5
22 changed files with 372 additions and 372 deletions

View File

@@ -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;