lp://staging/~upstart-devel/libnih/nih

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Ready for review for merging into lp://staging/libnih

Scott James Remnant: Pending requested 2013-03-14

Diff: 2208 lines (+661/-409)

56 files modified

ChangeLog (+46/-0)
nih-dbus-tool/argument.h (+1/-1)
nih-dbus-tool/demarshal.c (+3/-3)
nih-dbus-tool/demarshal.h (+1/-1)
nih-dbus-tool/indent.h (+2/-2)
nih-dbus-tool/interface.h (+8/-8)
nih-dbus-tool/main.c (+2/-2)
nih-dbus-tool/marshal.c (+39/-7)
nih-dbus-tool/marshal.h (+1/-1)
nih-dbus-tool/method.h (+7/-7)
nih-dbus-tool/node.h (+4/-4)
nih-dbus-tool/output.h (+2/-2)
nih-dbus-tool/parse.h (+2/-2)
nih-dbus-tool/property.h (+9/-9)
nih-dbus-tool/signal.h (+4/-4)
nih-dbus-tool/symbol.c (+2/-2)
nih-dbus-tool/symbol.h (+4/-4)
nih-dbus-tool/tests/expected/test_method_object_function_no_input.c (+13/-11)
nih-dbus-tool/tests/expected/test_method_object_function_standard.c (+13/-11)
nih-dbus-tool/tests/expected/test_method_reply_function_deprecated.c (+12/-11)
nih-dbus-tool/tests/expected/test_method_reply_function_standard.c (+12/-11)
nih-dbus-tool/tests/test_main.c (+2/-2)
nih-dbus-tool/tests/test_marshal.c (+164/-150)
nih-dbus-tool/tests/test_property.c (+1/-1)
nih-dbus-tool/type.c (+1/-1)
nih-dbus-tool/type.h (+15/-15)
nih-dbus/dbus_object.h (+1/-2)
nih-dbus/dbus_pending_data.h (+1/-1)
nih-dbus/dbus_proxy.c (+2/-2)
nih-dbus/dbus_proxy.h (+2/-2)
nih-dbus/dbus_util.h (+1/-1)
nih/alloc.c (+1/-2)
nih/alloc.h (+2/-2)
nih/child.h (+1/-1)
nih/command.h (+1/-1)
nih/config.h (+5/-5)
nih/file.c (+12/-2)
nih/file.h (+1/-1)
nih/hash.h (+1/-1)
nih/io.h (+8/-8)
nih/list.h (+2/-2)
nih/logging.c (+8/-11)
nih/main.h (+1/-1)
nih/option.h (+2/-2)
nih/signal.h (+1/-1)
nih/string.h (+17/-17)
nih/tests/test_file.c (+61/-0)
nih/tests/test_hash.c (+2/-1)
nih/tests/test_logging.c (+55/-60)
nih/tests/test_main.c (+1/-1)
nih/tests/test_option.c (+2/-2)
nih/tests/test_watch.c (+60/-0)
nih/timer.h (+4/-4)
nih/tree.h (+2/-2)
nih/watch.c (+33/-1)
nih/watch.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #672643: make test fails on xfs filesystem	Low	Triaged
Bug #997359: nih uses eglibc private symbol __abort_msg	Undecided	Confirmed

Link a bug report

Related blueprints

1061. By James Hunt on 2013-03-14

* Merge of lp:~vorlon/libnih/lp.776532.

Merged branch lp://staging/~vorlon/libnih/lp.776532

Bug #776532: nih_dir_walk_scan passes incorrect value to file filter

1060. By James Hunt on 2013-03-05

* Merge of lp:~jamesodhunt/libnih/bug-1123588-gcc-malloc-attribute.

1059. By James Hunt on 2013-03-05

* nih/logging.c: nih_log_abort_message(): Remove erroneous check
  left over from use of __abort_msg weak symbol.
* nih/tests/test_logging.c: Remove unecessary check on whether
  __nih_abort_msg has an address.

1058. By James Hunt on 2013-03-05

* Compiler appeasement

1057. By Stéphane Graber on 2012-12-17

* nih-dbus-tool/type.c, nih-dbus-tool/marshal.c: Update dbus code
generator to allow for empty lists for type 'as'. This drops the
!= NULL check for NULL terminated arrays and moves the iteration
loop inside an 'if' statement.

1056. By Dimitri John Ledkov on 2012-12-17

nih/file.c (nih_dir_walk_scan): Fallback to lstat, if the
non-portable dirent.d_type is not available.

1055. By James Hunt on 2012-12-17

* nih/logging.c: Use our own __nih_abort_msg rather than the (e)glibc
  private symbol __abort_msg to avoid upgrade issues (LP: #997359).
* nih/tests/test_logging.c: Update tests for __nih_abort_msg.

1054. By Scott James Remnant (Canonical) on 2011-09-01

* nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c
(test_unix_fd_to_str): Sanity check value before invoking strchr in
case it returns address of null (which would give a misleading test
pass).
* nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c
(test_unix_fd_to_str, test_unix_fd_to_str_sync): Sanity check value
before invoking strchr in case it returns address of null (which would
give a misleading test pass).
* nih/config.c (): nih_config_block_end: Add check to ensure strchr()
doesn't return address of null since this would result in a misleading
return value of TRUE.

1053. By Scott James Remnant (Canonical) on 2011-08-31

* nih/string.c (nih_str_split): Fixes to avoid over-running
input string and also returning an empty string array entry
when repeat is true (LP: #834813).
* nih/tests/test_string.c (test_str_split): Added a lot of new
tests for nih_str_split().

1052. By Scott James Remnant (Canonical) on 2011-08-26

* nih/io.c (nih_io_select_fds): Ensure number of fds being managed
is within limits.