@ -7916,6 +7916,7 @@ static int ast_say_number_full_ja(struct ast_channel *chan, int num, const char
int res = 0 ;
int playh = 0 ;
char fn [ 256 ] = " " ;
if ( ! num )
return ast_say_digits_full ( chan , 0 , ints , language , audiofd , ctrlfd ) ;
@ -8027,7 +8028,9 @@ int ast_say_date_ja(struct ast_channel *chan, time_t t, const char *ints, const
struct timeval tv = { t , 0 } ;
char fn [ 256 ] ;
int res = 0 ;
ast_localtime ( & tv , & tm , NULL ) ;
if ( ! res )
res = ast_say_number ( chan , tm . tm_year + 1900 , ints , lang , ( char * ) NULL ) ;
if ( ! res )
@ -8113,7 +8116,6 @@ static int ast_say_time_gr(struct ast_channel *chan, time_t t, const char *ints,
/* Japanese */
static int ast_say_time_ja ( struct ast_channel * chan , time_t t , const char * ints , const char * lang )
{
struct timeval tv = { t , 0 } ;
struct ast_tm tm ;
int res = 0 ;
@ -8198,7 +8200,7 @@ int ast_say_datetime_ja(struct ast_channel *chan, time_t t, const char *ints, co
struct ast_tm tm ;
char fn [ 256 ] ;
int res = 0 ;
int hour , pm = 0 ;
int hour , pm = 0 ;
ast_localtime ( & tv , & tm , NULL ) ;
@ -8435,7 +8437,7 @@ int ast_say_date_with_format_ja(struct ast_channel *chan, time_t time, const cha
{
struct timeval tv = { time , 0 } ;
struct ast_tm tm ;
int res = 0 , offset , sndoffset ;
int res = 0 , offset , sndoffset ;
char sndfile [ 256 ] , nextmsg [ 256 ] ;
if ( ! format )
@ -8443,13 +8445,13 @@ int ast_say_date_with_format_ja(struct ast_channel *chan, time_t time, const cha
ast_localtime ( & tv , & tm , timezone ) ;
for ( offset = 0 ; format [ offset ] ! = ' \0 ' ; offset + + ) {
for ( offset = 0 ; format [ offset ] ! = ' \0 ' ; offset + + ) {
ast_log ( LOG_DEBUG , " Parsing %c (offset %d) in %s \n " , format [ offset ] , offset , format ) ;
switch ( format [ offset ] ) {
/* NOTE: if you add more options here, please try to be consistent with strftime(3) */
case ' \' ' :
/* Literal name of a sound file */
for ( sndoffset = 0 ; ( format [ + + offset ] ! = ' \' ' ) & & ( sndoffset < sizeof ( sndfile ) - 1 ) ; sndoffset + + ) {
for ( sndoffset = 0 ; ( format [ + + offset ] ! = ' \' ' ) & & ( sndoffset < sizeof ( sndfile ) - 1 ) ; sndoffset + + ) {
sndfile [ sndoffset ] = format [ offset ] ;
}
sndfile [ sndoffset ] = ' \0 ' ;