Merge branch 'master' of ssh://athena/mnt/scm/git/ircstats

1 files changed, 1 insertions, 5 deletions

diff --git a/config.c b/config.c
index 3d683c2..d50c90b 100644
--- a/config.c
+++ b/config.c
@@ -59,7 +59,6 @@ int cfg_init() {
 			sprintf(sname, "channel #%d", i+1);
 			name = sname;
 		}
-		printf("Channel %s\n", name);
 		struct channel_t *channel;
 		if(!(channel = channel_add(name))) {
 			return 0;
@@ -70,9 +69,6 @@ int cfg_init() {
 			continue;
 		}
 		int file_count = config_setting_length(files);
-		/* Break if we can't set file count, most likely any following channels will also fail. */
-		if(!channel_set_file_count(channel, file_count))
-			break;
 		/* Iterate through files. */
 		for(int j = 0; j < file_count; j++) {
 			const char *filepath;
@@ -96,7 +92,7 @@ int cfg_init() {
 				filepath = config_setting_get_string(file);
 				rs_index = 0;
 			}
-			if(!channel_set_file(channel, j, filepath, rs_index)) {
+			if(!channel_file_add(channel, filepath, rs_index)) {
 				fprintf(stderr, "Failed to set file #%d (%s) for channel %s.\n", j+1, filepath, name);
 			}
 		}