PDFlow

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

  1. devel
  2. Merge into trunk
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
1=== modified file 'filters/flate.c'
2--- filters/flate.c 2010-11-11 13:08:13 +0000
3+++ filters/flate.c 2011-03-08 01:16:55 +0000
4@@ -153,9 +153,10 @@
5 sin.zfree = f_free;
6 sin.opaque = NULL;
7
8- if (inflateInit (&sin) != Z_OK)
9- return s_make_indirect (S_CSC_PARSE_ERROR,
10- sin.msg);
11+ res = inflateInit (&sin);
12+ if (res != Z_OK)
13+ return s_make_indirect (S_CSC_INTERNAL_ERROR,
14+ "zlib initialization error %d: %s", res, sin.msg);
15
16 out = NULL;
17 valid = 0;
18@@ -190,8 +191,8 @@
19 if (out != NULL)
20 free (out);
21
22- return s_make_indirect (S_CSC_PARSE_ERROR,
23- sin.msg);
24+ return s_make_indirect (S_CSC_INTERNAL_ERROR,
25+ "zlib error %d: %s", res, sin.msg);
26 }
27
28 obj_init_malloc_region (dest, out, out + valid);

Subscribers

People subscribed via source and target branches

to all changes: