Geis

Merge lp://staging/~bregma/geis/deb-811933 into lp://staging/geis

  1. deb-811933
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 337
Merged at revision: 337
Proposed branch: lp://staging/~bregma/geis/deb-811933
Merge into: lp://staging/geis
Diff against target: 55 lines (+10/-4)
3 files modified
libgeis/backend/grail/geis_grail_backend.c (+6/-2)
libgeis/geis_subscription.c (+2/-0)
libs/geis-util/geis_bag.h (+2/-2)
To merge this branch: bzr merge lp://staging/~bregma/geis/deb-811933
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend (community) Approve
Review via email: mp+283980@code.staging.launchpad.net

Commit message

fix error revealed by GCC-6

Description of the change

Fix errors detected by rebuilding with GCC-6.

(1) unused constants in a header (replaced with #define)
(2) bracing error in an if-statement (may have caused memory leaks)

Fixes Debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811933

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

Yep, looks correct.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/geis-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/geis-ci/19/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches