cli: removed copy-paste

modules/cli/cli.c

@@ -52,6 +52,23 @@ void SensorInfoTimerCallback(TimerHandle_t pxTimer) {
 	xTimerStart(cli_states[num_timer].RepeatSensorInfoTimer, 0);
 }
 
+static char *get_user_name(user_level_t user_id)
+{
+	char *username;
+	switch (user_id) {
+		case 0:
+			username = "Администратор";
+			break;
+		case 1:
+			username = "Пользователь";
+			break;
+		default:
+			username = "Неизвестен";
+			break;
+	}
+	return username;
+}
+
 static portBASE_TYPE FreeRTOS_ChangePWDProcess( int8_t * pcWriteBuffer, cli_state_t *s)
 {
 	portBASE_TYPE xReturn = pdTRUE;
@@ -90,18 +107,7 @@ static portBASE_TYPE FreeRTOS_ChangePWDProcess( int8_t * pcWriteBuffer, cli_stat
 			if (strncmp(password, password2, MAX_WEB_PASSWD_LEN) == 0) {
 				memcpy(sSettings.sAuth[s->id_change_pwd].password, password, 11);
 				cli_save_config(s);
-				const char *username;
-				switch (s->user_id) {
-					case 0:
-						username = "Администратор";
-						break;
-					case 1:
-						username = "Пользователь";
-						break;
-					default:
-						break;
-				}
-				log_event_data(LOG_PSW_CHANGE, username);
+				log_event_data(LOG_PSW_CHANGE, get_user_name(s->user_id));
 				strcpy( ( char * ) pcWriteBuffer, "\r\nПароль успешно изменен\r\n>" );
 				s->input_state = CLI_CMD;
 				xReturn = pdTRUE;
@@ -291,18 +297,7 @@ void cli_save_config(cli_state_t *cli_state)
 {
 	SETTINGS_Save();
 
-	const char *username;
-	switch (cli_state->user_id) {
-		case 0:
-			username = "Администратор";
-			break;
-		case 1:
-			username = "Пользователь";
-			break;
-		default:
-			break;
-	}
-    log_event_data(LOG_SETTING_SAVE, username);
+	log_event_data(LOG_SETTING_SAVE, get_user_name(cli_state->user_id));
 }
 
 user_level_t cli_auth_user(const char *user, const char *password, log_type_t log_entry_type)
@@ -321,19 +316,7 @@ user_level_t cli_auth_user(const char *user, const char *password, log_type_t lo
 
 			/* Login and pass are valid */
 			rv = user_id;
-			const char *username;
-			switch (user_id) {
-				case 0:
-					username = "Администратор";
-					break;
-				case 1:
-					username = "Пользователь";
-					break;
-				default:
-					break;
-			}
-
-			log_event_data(log_entry_type, username);
+			log_event_data(log_entry_type, get_user_name(user_id));
 			break;
 		}
 	}