From 804595d48399991d86b068c2fb788150515e7f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Leroy?= <frederic.leroy@b-com.com>
Date: Tue, 16 Aug 2016 11:18:13 +0200
Subject: [PATCH] style(conf2uedata.c): rewrite main() for readability
---
openair3/NAS/TOOLS/conf2uedata.c | 101 +++++++++++++++++--------------
1 file changed, 57 insertions(+), 44 deletions(-)
diff --git a/openair3/NAS/TOOLS/conf2uedata.c b/openair3/NAS/TOOLS/conf2uedata.c
index 094d44f464f..96902098f12 100644
--- a/openair3/NAS/TOOLS/conf2uedata.c
+++ b/openair3/NAS/TOOLS/conf2uedata.c
@@ -13,7 +13,8 @@ int main(int argc, char**argv) {
int rc = EXIT_SUCCESS;
int option;
const char* conf_file = NULL;
- while ((option = getopt(argc, argv, options)) != -1) {
+
+ while ((option = getopt(argc, argv, options)) != -1) {
switch (option) {
case 'c':
parse_data = TRUE;
@@ -31,19 +32,26 @@ int main(int argc, char**argv) {
break;
}
}
+
if (output == FALSE && parse_data == TRUE) {
printf("No output option found\n");
_display_usage();
return EXIT_FAILURE;
- } else if (output == TRUE && parse_data == FALSE) {
+ }
+
+ if (output == TRUE && parse_data == FALSE) {
printf("No Configuration file is given\n");
_display_usage();
return EXIT_FAILURE;
- } else if (parse_data == FALSE && print_data == FALSE) {
+ }
+
+ if (parse_data == FALSE && print_data == FALSE) {
printf("No options found\n");
_display_usage();
return EXIT_FAILURE;
- } else if (parse_data) {
+ }
+
+ if (parse_data) {
int ret;
int ue_nb = 0;
config_setting_t *root_setting = NULL;
@@ -51,55 +59,60 @@ int main(int argc, char**argv) {
config_setting_t *all_plmn_setting = NULL;
char user[10];
config_t cfg;
+
ret = get_config_from_file(conf_file, &cfg);
if (ret == EXIT_FAILURE) {
exit(1);
}
+
root_setting = config_root_setting(&cfg);
ue_nb = config_setting_length(root_setting) - 1;
- all_plmn_setting = config_setting_get_member(root_setting, PLMN);
- if (all_plmn_setting != NULL) {
- rc = parse_plmns(all_plmn_setting);
- if (rc == EXIT_FAILURE) {
- return rc;
- }
- fill_network_record_list();
- for (int i = 0; i < ue_nb; i++) {
- sprintf(user, "%s%d", UE, i);
- ue_setting = config_setting_get_member(root_setting, user);
- if (ue_setting != NULL) {
- rc = parse_ue_user_param(ue_setting, i);
- if (rc != EXIT_SUCCESS) {
- printf("Problem in USER section for UE%d. EXITING...\n",
- i);
- return EXIT_FAILURE;
- }
- _display_ue_data(i);
- rc = parse_ue_sim_param(ue_setting, i);
- if (rc != EXIT_SUCCESS) {
- printf("Problem in SIM section for UE%d. EXITING...\n",
- i);
- return EXIT_FAILURE;
- }
- rc = parse_ue_plmn_param(ue_setting, i);
- if (rc != EXIT_SUCCESS) {
- return EXIT_FAILURE;
- }
- gen_emm_data(i);
- _display_emm_data(i);
- gen_usim_data(i);
- _display_usim_data(i);
- } else {
- printf("Check UE%d settings\n", i);
- return EXIT_FAILURE;
- }
- }
- config_destroy(&cfg);
- } else {
+ all_plmn_setting = config_setting_get_member(root_setting, PLMN);
+ if (all_plmn_setting == NULL) {
printf("NO PLMN SECTION...EXITING...\n");
return (EXIT_FAILURE);
- }
+ }
+
+ rc = parse_plmns(all_plmn_setting);
+ if (rc == EXIT_FAILURE) {
+ return rc;
+ }
+ fill_network_record_list();
+
+ for (int i = 0; i < ue_nb; i++) {
+ sprintf(user, "%s%d", UE, i);
+
+ ue_setting = config_setting_get_member(root_setting, user);
+ if (ue_setting == NULL) {
+ printf("Check UE%d settings\n", i);
+ return EXIT_FAILURE;
+ }
+
+ rc = parse_ue_user_param(ue_setting, i);
+ if (rc != EXIT_SUCCESS) {
+ printf("Problem in USER section for UE%d. EXITING...\n", i);
+ return EXIT_FAILURE;
+ }
+ _display_ue_data(i);
+
+ rc = parse_ue_sim_param(ue_setting, i);
+ if (rc != EXIT_SUCCESS) {
+ printf("Problem in SIM section for UE%d. EXITING...\n", i);
+ return EXIT_FAILURE;
+ }
+
+ rc = parse_ue_plmn_param(ue_setting, i);
+ if (rc != EXIT_SUCCESS) {
+ return EXIT_FAILURE;
+ }
+ gen_emm_data(i);
+ _display_emm_data(i);
+
+ gen_usim_data(i);
+ _display_usim_data(i);
+ }
+ config_destroy(&cfg);
}
exit(EXIT_SUCCESS);
--
GitLab