From ddf7c37ec779e9237f92bff53f19284e309dd120 Mon Sep 17 00:00:00 2001 From: Bach Le Date: Sat, 21 Nov 2015 23:31:38 +0800 Subject: [PATCH] Fix error handling in gb_ini - Report GB_INI_ERROR_FILE_ERROR when file cannot be read - Report error from handler --- gb_ini.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gb_ini.h b/gb_ini.h index 413298f..e6e7f9d 100644 --- a/gb_ini.h +++ b/gb_ini.h @@ -357,7 +357,7 @@ gb__string_copy(char* dst, const char* src, size_t size) struct gb_Ini_Error gb_ini_parse(const char* filename, gb_Ini_Handler* handler_func, void* data) { - struct gb_Ini_Error err = {GB_INI_ERROR_NONE, 0}; + struct gb_Ini_Error err = {GB_INI_ERROR_FILE_ERROR, 0}; FILE* file = fopen(filename, "r"); if (!file) @@ -436,7 +436,7 @@ gb_ini_parse_file(FILE* file, gb_Ini_Handler* handler_func, void* data) gb__right_whitespace_strip(value); gb__string_copy(prev_name, name, sizeof(prev_name)); - if (!handler_func(data, section, name, value) && err.type) + if (!handler_func(data, section, name, value) && !err.type) { err.type = GB_INI_ERROR_HANDLER_ERROR; err.line_num = line_num;