Merge tilghman's patches
authorMark Spencer <markster@digium.com>
Sun, 21 Sep 2003 15:23:54 +0000 (15:23 +0000)
committerMark Spencer <markster@digium.com>
Sun, 21 Sep 2003 15:23:54 +0000 (15:23 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1536 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail2.c
stdtime/localtime.c

index 0db25ad..6ff1a01 100755 (executable)
@@ -1955,7 +1955,7 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v
        /* Can't think of how other diffs might be helpful, but I'm sure somebody will think of something. */
 #endif
        if (the_zone)
-               res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, the_zone->msg_format, the_zone->timezone);
+               res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, the_zone->msg_format, &(the_zone->timezone));
        else
                res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' IMp", NULL);
 #if 0
index 18a1b59..276eb9f 100755 (executable)
@@ -981,11 +981,14 @@ const char * const        zone;
 
        sp = lclptr;
        /* Find the right zone record */
-       while (sp != NULL) {
-               if (!strcmp(sp->name,zone))
-                       break;
-               sp = sp->next;
-       }
+       if (zone == NULL)
+               sp = NULL;
+       else
+               while (sp != NULL) {
+                       if (!strcmp(sp->name,zone))
+                               break;
+                       sp = sp->next;
+               }
 
        if (sp == NULL) {
                ast_tzsetwall();