Merge lp:~pac72/pdflow/devel into lp:pdflow

Proposed by Paolo Cancedda
Status: Needs review
Proposed branch: lp:~pac72/pdflow/devel
Merge into: lp:pdflow
Diff against target: 28 lines (+6/-5)
1 file modified
filters/flate.c (+6/-5)
To merge this branch: bzr merge lp:~pac72/pdflow/devel
Reviewer Review Type Date Requested Status
Alberto Cuda Pending
Review via email: mp+52499@code.launchpad.net

Description of the change

Trivial warnings removed.

To post a comment you must log in.

Unmerged revisions

51. By Paolo Cancedda

Removed two warnings.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'filters/flate.c'
--- filters/flate.c 2010-11-11 13:08:13 +0000
+++ filters/flate.c 2011-03-08 01:16:55 +0000
@@ -153,9 +153,10 @@
153 sin.zfree = f_free;153 sin.zfree = f_free;
154 sin.opaque = NULL;154 sin.opaque = NULL;
155155
156 if (inflateInit (&sin) != Z_OK)156 res = inflateInit (&sin);
157 return s_make_indirect (S_CSC_PARSE_ERROR,157 if (res != Z_OK)
158 sin.msg);158 return s_make_indirect (S_CSC_INTERNAL_ERROR,
159 "zlib initialization error %d: %s", res, sin.msg);
159160
160 out = NULL;161 out = NULL;
161 valid = 0;162 valid = 0;
@@ -190,8 +191,8 @@
190 if (out != NULL)191 if (out != NULL)
191 free (out);192 free (out);
192193
193 return s_make_indirect (S_CSC_PARSE_ERROR,194 return s_make_indirect (S_CSC_INTERNAL_ERROR,
194 sin.msg);195 "zlib error %d: %s", res, sin.msg);
195 }196 }
196197
197 obj_init_malloc_region (dest, out, out + valid);198 obj_init_malloc_region (dest, out, out + valid);

Subscribers

People subscribed via source and target branches

to all changes: