From 17f50a2ce2fae766221269eb52015d0adb3efab2 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 24 Jul 2003 21:05:36 +0000 Subject: Fix uses of g_assert() around statements with side effects. (#115498, Thu Jul 24 17:04:21 2003 Owen Taylor * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): Fix uses of g_assert() around statements with side effects. (#115498, patch from David Cuthbert) --- ChangeLog | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-4 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/opentype/pango-ot-ruleset.c | 14 +++++++++----- 6 files changed, 39 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee366a48..22d43de7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jul 24 17:04:21 2003 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Fix uses of g_assert() around statements with side effects. + (#115498, patch from David Cuthbert) + Thu Jul 24 16:40:12 2003 Owen Taylor * configure.in tests/runtests.sh.in: Generate diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ee366a48..22d43de7 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Thu Jul 24 17:04:21 2003 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Fix uses of g_assert() around statements with side effects. + (#115498, patch from David Cuthbert) + Thu Jul 24 16:40:12 2003 Owen Taylor * configure.in tests/runtests.sh.in: Generate diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ee366a48..22d43de7 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Thu Jul 24 17:04:21 2003 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Fix uses of g_assert() around statements with side effects. + (#115498, patch from David Cuthbert) + Thu Jul 24 16:40:12 2003 Owen Taylor * configure.in tests/runtests.sh.in: Generate diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ee366a48..22d43de7 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Thu Jul 24 17:04:21 2003 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Fix uses of g_assert() around statements with side effects. + (#115498, patch from David Cuthbert) + Thu Jul 24 16:40:12 2003 Owen Taylor * configure.in tests/runtests.sh.in: Generate diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ee366a48..22d43de7 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Thu Jul 24 17:04:21 2003 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Fix uses of g_assert() around statements with side effects. + (#115498, patch from David Cuthbert) + Thu Jul 24 16:40:12 2003 Owen Taylor * configure.in tests/runtests.sh.in: Generate diff --git a/pango/opentype/pango-ot-ruleset.c b/pango/opentype/pango-ot-ruleset.c index 1fdf734c..756d0214 100644 --- a/pango/opentype/pango-ot-ruleset.c +++ b/pango/opentype/pango-ot-ruleset.c @@ -156,6 +156,7 @@ pango_ot_ruleset_shape (PangoOTRuleset *ruleset, { int i; int last_cluster; + int result; TTO_GSUB gsub = NULL; TTO_GPOS gpos = NULL; @@ -214,9 +215,11 @@ pango_ot_ruleset_shape (PangoOTRuleset *ruleset, if (!gsub && !gpos) return; - g_assert (TT_GSUB_String_New (ruleset->info->face->memory, - &in_string) == FT_Err_Ok); - g_assert (TT_GSUB_String_Set_Length (in_string, glyphs->num_glyphs) == FT_Err_Ok); + result = TT_GSUB_String_New (ruleset->info->face->memory, &in_string); + g_assert (result == FT_Err_Ok); + + result = TT_GSUB_String_Set_Length (in_string, glyphs->num_glyphs); + g_assert (result == FT_Err_Ok); for (i = 0; i < glyphs->num_glyphs; i++) { @@ -228,8 +231,9 @@ pango_ot_ruleset_shape (PangoOTRuleset *ruleset, if (gsub) { - g_assert (TT_GSUB_String_New (ruleset->info->face->memory, - &out_string) == FT_Err_Ok); + result = TT_GSUB_String_New (ruleset->info->face->memory, + &out_string); + g_assert (result == FT_Err_Ok); result_string = out_string; TT_GSUB_Apply_String (gsub, in_string, out_string); -- cgit v1.2.1