summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-08-14 13:29:24 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-15 23:40:57 +0200
commitd244713340420d118b27e9baac0bd06fb1fde560 (patch)
tree9f79da627ecfac3071cc4356a4dab14071d8ba7d /src/3rdparty
parent069469b468c482244c5d0c1459be32e8fbbca1eb (diff)
Silence a false-positive warning about uninitialised variable with ICC
ICC complains like so: harfbuzz-gpos.c(95): warning #592: variable "error" is used before its value is set return error; ^ However, line 95 is never executed because the condition on line 94 is always false. That's why it's a false positive. The same construct happens in the other two places. Still, silence the warning. Change-Id: I168d916d6837d4ac346facfd22b3e5b4e22ef7f0 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-gdef.c2
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-gpos.c2
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-gsub.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c
index 966b167b90..a4bf9352c7 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c
@@ -82,7 +82,7 @@ HB_Error HB_New_GDEF_Table( HB_GDEFHeader** retptr )
HB_Error HB_Load_GDEF_Table( HB_Stream stream,
HB_GDEFHeader** retptr )
{
- HB_Error error;
+ HB_Error error = HB_Err_Ok;
HB_UInt cur_offset, new_offset, base_offset;
HB_GDEFHeader* gdef;
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
index 44ed64c520..ecf647e96a 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
@@ -85,7 +85,7 @@ HB_Error HB_Load_GPOS_Table( HB_Stream stream,
HB_GPOSHeader* gpos;
- HB_Error error;
+ HB_Error error = HB_Err_Ok;
if ( !retptr )
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gsub.c b/src/3rdparty/harfbuzz/src/harfbuzz-gsub.c
index 21fec51924..9b6b59875a 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-gsub.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gsub.c
@@ -50,7 +50,7 @@ HB_Error HB_Load_GSUB_Table( HB_Stream stream,
HB_GDEFHeader* gdef,
HB_Stream gdefStream )
{
- HB_Error error;
+ HB_Error error = HB_Err_Ok;
HB_UInt cur_offset, new_offset, base_offset;
HB_GSUBHeader* gsub;