Merge "app_voicemail, say: Fix various leading whitespace problems" into 17

apps/app_voicemail.c

@@ -10671,7 +10671,6 @@ static int vm_instructions(struct ast_channel *chan, struct ast_vm_user *vmu, st
 	}
 }
 
-
 static int vm_newuser_setup(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc, signed char record_gain)
 {
 	int cmd = 0;

main/say.c

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