From 23d94e4846bf4ec13069703a28b1d776f4bbe44f Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sat, 13 Oct 2018 18:49:47 +0000
Subject: [PATCH] Cleaning & commenting #3 - refactoring constants to Config class
---
src/option_list.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/option_list.c b/src/option_list.c
index 9411be3..dfab81b 100644
--- a/src/option_list.c
+++ b/src/option_list.c
@@ -12,7 +12,7 @@
int nu = 0;
list *options = make_list();
while((line=fgetl(file)) != 0){
- ++ nu;
+ ++nu;
strip(line);
switch(line[0]){
case '\0':
@@ -34,21 +34,21 @@
metadata get_metadata(char *file)
{
- metadata m = { 0 };
- list *options = read_data_cfg(file);
+ metadata m = { 0 };
+ list *options = read_data_cfg(file);
- char *name_list = option_find_str(options, "names", 0);
- if (!name_list) name_list = option_find_str(options, "labels", 0);
- if (!name_list) {
- fprintf(stderr, "No names or labels found\n");
- }
- else {
- m.names = get_labels(name_list);
- }
- m.classes = option_find_int(options, "classes", 2);
- free_list(options);
- printf("Loaded - names_list: %s, classes = %d \n", name_list, m.classes);
- return m;
+ char *name_list = option_find_str(options, "names", 0);
+ if (!name_list) name_list = option_find_str(options, "labels", 0);
+ if (!name_list) {
+ fprintf(stderr, "No names or labels found\n");
+ }
+ else {
+ m.names = get_labels(name_list);
+ }
+ m.classes = option_find_int(options, "classes", 2);
+ free_list(options);
+ printf("Loaded - names_list: %s, classes = %d \n", name_list, m.classes);
+ return m;
}
int read_option(char *s, list *options)
--
Gitblit v1.10.0