← Back to branch summary

~jamesodhunt/upstart/bug-1221466+1222702

« back to all changes in this revision

Viewing changes to extra/upstart-dbus-bridge.c

  • Committer: James Hunt
  • Date: 2013-07-24 09:40:15 UTC
  • Revision ID: james.hunt@ubuntu.com-20130724094015-do4ynwwn8r9codei
* extra/upstart-dbus-bridge.c: signal_filter(): Use inttype macros to
  ensure portability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/upstart-dbus-bridge.c
26
26
#include <stdlib.h>
27
27
#include <string.h>
28
28
#include <ctype.h>
 
29
#include <inttypes.h>
29
30
 
30
31
#include <nih/macros.h>
31
32
#include <nih/alloc.h>
352
353
 
353
354
        /* Destroy any PID file we may have created */
354
355
        if (daemonise) {
355
 
                nih_main_unlink_pidfile();
 
356
                nih_main_unlink_pidfile ();
356
357
        }
357
358
 
358
359
        return ret;
532
533
                int current_type = DBUS_TYPE_INVALID;
533
534
                int arg_num = 0;
534
535
 
535
 
                while ((current_type = dbus_message_iter_get_arg_type(&message_iter)) != DBUS_TYPE_INVALID) {
 
536
                while ((current_type = dbus_message_iter_get_arg_type (&message_iter)) != DBUS_TYPE_INVALID) {
536
537
                        nih_local char *var = NULL;
537
538
 
538
539
                        switch (current_type) {
539
540
                                case DBUS_TYPE_BOOLEAN: {
540
541
                                        dbus_bool_t arg = 0;
541
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
542
                                        dbus_message_iter_get_basic (&message_iter, &arg);
542
543
 
543
544
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%s", arg_num, arg ? "TRUE" : "FALSE"));
544
545
                                        break;
547
548
                                        dbus_int16_t arg = 0;
548
549
                                        dbus_message_iter_get_basic(&message_iter, &arg);
549
550
 
550
 
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%u", arg_num, arg));
 
551
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIi16, arg_num, arg));
551
552
                                        break;
552
553
                                }
553
554
                                case DBUS_TYPE_UINT16: {
554
555
                                        dbus_uint16_t arg = 0;
555
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
556
                                        dbus_message_iter_get_basic (&message_iter, &arg);
556
557
 
557
 
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%d", arg_num, arg));
 
558
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIu16, arg_num, arg));
558
559
                                        break;
559
560
                                }
560
561
                                case DBUS_TYPE_INT32: {
561
562
                                        dbus_int32_t arg = 0;
562
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
563
                                        dbus_message_iter_get_basic (&message_iter, &arg);
563
564
 
564
 
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%d", arg_num, arg));
 
565
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIi32, arg_num, arg));
565
566
                                        break;
566
567
                                }
567
568
                                case DBUS_TYPE_UINT32: {
568
569
                                        dbus_uint32_t arg = 0;
569
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
570
                                        dbus_message_iter_get_basic (&message_iter, &arg);
570
571
 
571
 
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%u", arg_num, arg));
 
572
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIu32, arg_num, arg));
572
573
                                        break;
573
574
                                }
574
575
                                case DBUS_TYPE_INT64: {
575
576
                                        dbus_int64_t arg = 0;
576
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
577
                                        dbus_message_iter_get_basic (&message_iter, &arg);
577
578
 
578
 
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%ld", arg_num, arg));
 
579
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIi64, arg_num, arg));
579
580
                                        break;
580
581
                                }
581
582
                                case DBUS_TYPE_UINT64: {
582
583
                                        dbus_uint64_t arg = 0;
583
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
584
                                        dbus_message_iter_get_basic (&message_iter, &arg);
584
585
 
585
 
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%lu", arg_num, arg));
 
586
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%" PRIu64, arg_num, arg));
586
587
                                        break;
587
588
                                }
588
589
                                case DBUS_TYPE_DOUBLE: {
589
590
                                        double arg = 0;
590
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
591
                                        dbus_message_iter_get_basic (&message_iter, &arg);
591
592
 
592
593
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%f", arg_num, arg));
593
594
                                        break;
594
595
                                }
595
596
                                case DBUS_TYPE_STRING: {
596
597
                                        const char * arg = NULL;
597
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
598
                                        dbus_message_iter_get_basic (&message_iter, &arg);
598
599
 
599
600
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%s", arg_num, arg));
600
601
                                        break;
601
602
                                }
602
603
                                case DBUS_TYPE_OBJECT_PATH: {
603
604
                                        const char * arg = NULL;
604
 
                                        dbus_message_iter_get_basic(&message_iter, &arg);
 
605
                                        dbus_message_iter_get_basic (&message_iter, &arg);
605
606
 
606
607
                                        var = NIH_MUST (nih_sprintf (NULL, "ARG%d=%s", arg_num, arg));
607
608
                                        break;
614
615
                                NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
615
616
                        }
616
617
 
617
 
                        dbus_message_iter_next(&message_iter);
 
618
                        dbus_message_iter_next (&message_iter);
618
619
                        arg_num++;
619
620
                }
620
621
        }