Merge lp://staging/~vorlon/libnih/lp.776532 into lp://staging/libnih
Proposed by
Steve Langasek
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~vorlon/libnih/lp.776532 |
| Merge into: | lp://staging/libnih |
| Diff against target: |
161 lines (+103/-1) 3 files modified
ChangeLog (+10/-0) nih/tests/test_watch.c (+60/-0) nih/watch.c (+33/-1) |
| To merge this branch: | bzr merge lp://staging/~vorlon/libnih/lp.776532 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Scott James Remnant | Pending | ||
|
Review via email:
|
|||
Description of the change
Follow-up to lp:~jamesodhunt/libnih/bug-776532 which does the wrapping in
the right place (and thus passes the test suite).
To post a comment you must log in.
Unmerged revisions
- 1056. By Steve Langasek
-
Fix bug #776532 properly, the bug is in the caller (nih_watch_add), not in nih_dir_
walk_scan( ). - 1055. By James Hunt
-
* nih/file.c (nih_dir_
walk_filter) : New NihFileFilter function passed to
nih_dir_walk_scan() to ensure the nih_watch_new() filter function is
passed the NihWatch data rather than the data passed to the
nih_dir_walk() NihFileVisitor function (LP: #776532).* nih/tests/
test_watch. c (test_new): New test "with filter and data"
to ensure filter is passed correct value.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
