diff --git a/include/cpp.h b/include/cpp.h index 26c5301..e63cedf 100644 --- a/include/cpp.h +++ b/include/cpp.h @@ -119,8 +119,6 @@ void cpp_delete(Cpp * cpp); /* accessors */ char const * cpp_get_filename(Cpp * cpp); -int cpp_is_defined(Cpp * cpp, char const * name); - /* useful */ int cpp_define_add(Cpp * cpp, char const * name, char const * value); char const * cpp_define_get(Cpp * cpp, char const * name); diff --git a/src/cpp.c b/src/cpp.c index 21f8f66..ce986ee 100644 --- a/src/cpp.c +++ b/src/cpp.c @@ -101,18 +101,6 @@ char const * cpp_get_filename(Cpp * cpp) } -/* cpp_is_defined */ -int cpp_is_defined(Cpp * cpp, char const * name) -{ - size_t i; - - for(i = 0; i < cpp->defines_cnt; i++) - if(strcmp(cpp->defines[i].name, name) == 0) - return 1; - return 0; -} - - /* useful */ /* cpp_define_add */ int cpp_define_add(Cpp * cpp, char const * name, char const * value) diff --git a/src/scanner.c b/src/scanner.c index e606247..5e137f0 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -187,7 +187,7 @@ static int _scan_ifdef(Cpp * cpp, Token ** token) DEBUG_SCOPE(); name = token_get_data(*token); - take = cpp_is_defined(cpp, name); + take = (cpp_define_get(cpp, name) != NULL) ? 1 : 0; token_set_data(*token, NULL); free(name); _cpp_scope_push(cpp, take ? CPP_SCOPE_TAKING : CPP_SCOPE_NOTYET); @@ -201,7 +201,7 @@ static int _scan_ifndef(Cpp * cpp, Token ** token) DEBUG_SCOPE(); name = token_get_data(*token); - take = !cpp_is_defined(cpp, name); + take = (cpp_define_get(cpp, name) == NULL) ? 1 : 0; token_set_data(*token, NULL); free(name); _cpp_scope_push(cpp, take ? CPP_SCOPE_TAKING : CPP_SCOPE_NOTYET);