------------------------------------------------------------ revno: 1514 committer: James Hunt <[email protected]> branch nick: upstart timestamp: Wed 2013-07-24 10:40:15 +0100 message: * extra/upstart-dbus-bridge.c: signal_filter(): Use inttype macros to ensure portability. modified: ChangeLog extra/upstart-dbus-bridge.c
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-07-19 22:54:24 +0000 +++ ChangeLog 2013-07-24 09:40:15 +0000 @@ -1,3 +1,8 @@ +2013-07-24 James Hunt <[email protected]> + + * extra/upstart-dbus-bridge.c: signal_filter(): Use inttype + macros to ensure portability. + 2013-07-19 Dmitrijs Ledkovs <[email protected]> * init/session.c: fix a bug in session_from_index to handle more === modified file 'extra/upstart-dbus-bridge.c' --- extra/upstart-dbus-bridge.c 2013-07-24 09:22:25 +0000 +++ extra/upstart-dbus-bridge.c 2013-07-24 09:40:15 +0000 @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> +#include <inttypes.h> #include <nih/macros.h> #include <nih/alloc.h> @@ -352,7 +353,7 @@ /* Destroy any PID file we may have created */ if (daemonise) { - nih_main_unlink_pidfile(); + nih_main_unlink_pidfile (); } return ret; @@ -532,13 +533,13 @@ int current_type = DBUS_TYPE_INVALID; int arg_num = 0; - while ((current_type = dbus_message_iter_get_arg_type(&message_iter)) != DBUS_TYPE_INVALID) { + while ((current_type = dbus_message_iter_get_arg_type (&message_iter)) != DBUS_TYPE_INVALID) { nih_local char *var = NULL; switch (current_type) { case DBUS_TYPE_BOOLEAN: { dbus_bool_t arg = 0; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%s", arg_num, arg ? "TRUE" : "FALSE")); break; @@ -547,61 +548,61 @@ dbus_int16_t arg = 0; dbus_message_iter_get_basic(&message_iter, &arg); - var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%u", arg_num, arg)); + var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIi16, arg_num, arg)); break; } case DBUS_TYPE_UINT16: { dbus_uint16_t arg = 0; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); - var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%d", arg_num, arg)); + var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIu16, arg_num, arg)); break; } case DBUS_TYPE_INT32: { dbus_int32_t arg = 0; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); - var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%d", arg_num, arg)); + var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIi32, arg_num, arg)); break; } case DBUS_TYPE_UINT32: { dbus_uint32_t arg = 0; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); - var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%u", arg_num, arg)); + var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIu32, arg_num, arg)); break; } case DBUS_TYPE_INT64: { dbus_int64_t arg = 0; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); - var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%ld", arg_num, arg)); + var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIi64, arg_num, arg)); break; } case DBUS_TYPE_UINT64: { dbus_uint64_t arg = 0; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); - var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%lu", arg_num, arg)); + var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIu64, arg_num, arg)); break; } case DBUS_TYPE_DOUBLE: { double arg = 0; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%f", arg_num, arg)); break; } case DBUS_TYPE_STRING: { const char * arg = NULL; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%s", arg_num, arg)); break; } case DBUS_TYPE_OBJECT_PATH: { const char * arg = NULL; - dbus_message_iter_get_basic(&message_iter, &arg); + dbus_message_iter_get_basic (&message_iter, &arg); var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%s", arg_num, arg)); break; @@ -614,7 +615,7 @@ NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var)); } - dbus_message_iter_next(&message_iter); + dbus_message_iter_next (&message_iter); arg_num++; } }
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
