diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2019-10-11 09:42:24 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-10-11 10:16:30 -0400 |
commit | de96af44dd731fbb0c59e19e190ab2cf593f5430 (patch) | |
tree | 48b4a7bc49d81facadde16eed6d30160dbfc2e87 | |
parent | bd1610d26a28dc3edb76fb9b3a5e4e7bb5c872ff (diff) | |
download | efl-de96af44dd731fbb0c59e19e190ab2cf593f5430.tar.gz |
evas/language: #ifdef guard variable which is only used inside #ifdef
Summary:
this variable is already only changed inside an #ifdef, so declare and
free it only inside the same ifdef for clarity
CIDs 1401016, 1400807
Reviewers: cedric
Reviewed By: cedric
Subscribers: bu5hm4n, cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10320
-rw-r--r-- | src/lib/evas/common/language/evas_bidi_utils.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/evas/common/language/evas_bidi_utils.c b/src/lib/evas/common/language/evas_bidi_utils.c index a4653416e7..c8360643a2 100644 --- a/src/lib/evas/common/language/evas_bidi_utils.c +++ b/src/lib/evas/common/language/evas_bidi_utils.c @@ -233,7 +233,9 @@ evas_bidi_paragraph_props_get(const Eina_Unicode *eina_ustr, size_t len, EvasBiDiCharType *char_types = NULL; EvasBiDiLevel *embedding_levels = NULL; const FriBidiChar *ustr; +#ifdef EVAS_FRIBIDI_EINA_UNICODE_UNEQUAL FriBidiChar *base_ustr = NULL; +#endif EvasBiDiLevel ret_level = 0; #if FRIBIDI_MAJOR_VERSION >= 1 EvasBiDiBracketType *bracket_types = NULL; @@ -392,8 +394,9 @@ evas_bidi_paragraph_props_get(const Eina_Unicode *eina_ustr, size_t len, free(bidi_props->char_types); } bidi_props->char_types = char_types; - +#ifdef EVAS_FRIBIDI_EINA_UNICODE_UNEQUAL if (base_ustr) free(base_ustr); +#endif #if FRIBIDI_MAJOR_VERSION >= 1 /* Currently, bracket_types is not reused in other places. */ if (bracket_types) free(bracket_types); @@ -408,7 +411,9 @@ cleanup: if (bracket_types) free(bracket_types); #endif if (embedding_levels) free(embedding_levels); +#ifdef EVAS_FRIBIDI_EINA_UNICODE_UNEQUAL if (base_ustr) free(base_ustr); +#endif if (bidi_props) evas_bidi_paragraph_props_unref(bidi_props); /* Clean up the bidi props */ return NULL; } |