mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 12:16:00 +00:00
Keep up with shadow warnings. One day I'll actually enable this in the Makefile.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@147457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2157,9 +2157,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
||||
|
||||
for ( ; var; var = var->next) {
|
||||
if (!strcasecmp(var->name, "endtime")) {
|
||||
struct ast_tm tm;
|
||||
ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &tm);
|
||||
tmp = ast_mktime(&tm, NULL);
|
||||
struct ast_tm endtime_tm;
|
||||
ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &endtime_tm);
|
||||
tmp = ast_mktime(&endtime_tm, NULL);
|
||||
localendtime = tmp.tv_sec;
|
||||
}
|
||||
}
|
||||
@@ -3057,9 +3057,9 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
|
||||
} else if (!strcasecmp(var->name, "adminopts")) {
|
||||
ast_copy_string(adminopts, var->value, sizeof(char[OPTIONS_LEN]));
|
||||
} else if (!strcasecmp(var->name, "endtime")) {
|
||||
struct ast_tm tm;
|
||||
ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &tm);
|
||||
endtime = ast_mktime(&tm, NULL);
|
||||
struct ast_tm endtime_tm;
|
||||
ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &endtime_tm);
|
||||
endtime = ast_mktime(&endtime_tm, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user