Use NTPTIME_INITIALIZER at other places

Again, the goal is to make the code more readable.

diff --git a/orte/examples/hello/h_publisher.c b/orte/examples/hello/h_publisher.c
index 1d3ac207721800c0394a8d64f488482fd932e6c6..d2004d9a1fd3f8428d7b7c2e93899f951d85bcb4 100644 (file)
--- a/orte/examples/hello/h_publisher.c
+++ b/orte/examples/hello/h_publisher.c
@@ -69,11 +69,10 @@ void *
 publisherCreate(void *arg)
 {
   ORTEPublication     *p;
-  NtpTime             persistence, delay;
+  NtpTime             persistence = NTPTIME_INITIALIZER(3);
+  NtpTime             delay = NTPTIME_INITIALIZER(1);
 
   ORTETypeRegisterAdd(d, "HelloMsg", NULL, NULL, NULL, sizeof(instance2Send));
-  NTPTIME_BUILD(persistence, 3);
-  NTPTIME_BUILD(delay, 1);
   p = ORTEPublicationCreate(
     d,
     "Example HelloMsg",

diff --git a/orte/examples/hello/h_subscriber.c b/orte/examples/hello/h_subscriber.c
index 4282f04b8582f298306fd0b499eef07b2325ec0b..38f8903dcb5e29f75f995a35fd1c130efff0aafb 100644 (file)
--- a/orte/examples/hello/h_subscriber.c
+++ b/orte/examples/hello/h_subscriber.c
@@ -69,11 +69,10 @@ static void *
 subscriberCreate(void *arg)
 {
   ORTESubscription    *s;
-  NtpTime             deadline, minimumSeparation;
+  NtpTime             deadline = NTPTIME_INITIALIZER(10);
+  NtpTime             minimumSeparation = NTPTIME_INITIALIZER(0);
 
   ORTETypeRegisterAdd(d, "HelloMsg", NULL, NULL, NULL, sizeof(instance2Recv));
-  NTPTIME_BUILD(deadline, 10);
-  NTPTIME_BUILD(minimumSeparation, 0);
   s = ORTESubscriptionCreate(
     d,
     IMMEDIATE,

diff --git a/orte/examples/multicast/m_subscriber.c b/orte/examples/multicast/m_subscriber.c
index 3e93a304782fbd947ce5bfcf5b1335b5cc21c931..a60a13eee9799bb4ec5243b9197d2385b0946c5f 100644 (file)
--- a/orte/examples/multicast/m_subscriber.c
+++ b/orte/examples/multicast/m_subscriber.c
@@ -65,11 +65,9 @@ static void *
 subscriberCreate(void *arg)
 {
   ORTESubscription    *s;
-  NtpTime             deadline, minimumSeparation;
+  NtpTime             deadline = NTPTIME_INITIALIZER(10), minimumSeparation = NTPTIME_INITIALIZER(0);
 
   ORTETypeRegisterAdd(d, "HelloMsg", NULL, NULL, maxDataSize, sizeof(instance2Recv));
-  NTPTIME_BUILD(deadline, 10);
-  NTPTIME_BUILD(minimumSeparation, 0);
   s = ORTESubscriptionCreate(
     d,
     IMMEDIATE,

diff --git a/orte/examples/ping/orteping.c b/orte/examples/ping/orteping.c
index 238f29ed1bd57a1094a5ea507538289d5f960596..10920956a31a9337b5b3fe97b2e8e3809fd588d8 100644 (file)
--- a/orte/examples/ping/orteping.c
+++ b/orte/examples/ping/orteping.c
@@ -159,7 +159,8 @@ main(int argc, char *argv[])
   int                     opt, domain = ORTE_DEFAULT_DOMAIN;
   int32_t                 strength = 1;
   int32_t                 instanceSend = 0, instanceRecv = 0;
-  NtpTime                 persistence, deadline, minimumSeparation, delay;
+  NtpTime                 persistence, deadline, minimumSeparation = NTPTIME_INITIALIZER(0);
+  NtpTime                 delay = NTPTIME_INITIALIZER(1);
   Boolean                 havePublisher = ORTE_FALSE;
   Boolean                 haveSubscriber = ORTE_FALSE;
   IPAddress               smIPAddress = IPADDRESS_INVALID;
@@ -167,8 +168,6 @@ main(int argc, char *argv[])
 
   ORTEInit();
   ORTEDomainPropDefaultGet(&dp);
-  NTPTIME_BUILD(minimumSeparation, 0);
-  NTPTIME_BUILD(delay, 1); //1s
 
 #if defined HAVE_GETOPT_LONG || defined HAVE_GETOPT_LONG_ORTE
   while ((opt = getopt_long(argc, argv, "m:S:d:v:R:E:P:l:I:i:t:D:Vhpsq", &long_opts[0], NULL)) != EOF) {

diff --git a/orte/examples/reliable/r_publisher.c b/orte/examples/reliable/r_publisher.c
index 1a270f371c36b5c64b58525989fdfc93c2a3a6cc..9531e2091ea19d14f3b787f4ea25fab3bec67c8b 100644 (file)
--- a/orte/examples/reliable/r_publisher.c
+++ b/orte/examples/reliable/r_publisher.c
@@ -64,13 +64,11 @@ int
 main(int argc, char *args[])
 {
   ORTEPublication *p;
-  NtpTime         persistence, repeating;
+  NtpTime         persistence = NTPTIME_INITIALIZER(3), repeating = NTPTIME_INITIALIZER(1);
 
   ORTEInit();
   d = ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN, NULL, NULL, ORTE_FALSE);
   ORTETypeRegisterAdd(d, "HelloMsg", NULL, NULL, NULL, sizeof(instance2Send));
-  NTPTIME_BUILD(persistence, 3);
-  NTPTIME_BUILD(repeating, 1);
   p = ORTEPublicationCreate(
     d,
     "Reliable HelloMsg",

diff --git a/orte/examples/reliable/r_subscriber_besteffort.c b/orte/examples/reliable/r_subscriber_besteffort.c
index 63832dfdc36afc0133458a987a046efbf1047d70..b9f42e065dab5ea95bd1f2fe21aaddfa2649907d 100644 (file)
--- a/orte/examples/reliable/r_subscriber_besteffort.c
+++ b/orte/examples/reliable/r_subscriber_besteffort.c
@@ -63,14 +63,12 @@ int
 main(int argc, char *args[])
 {
   ORTESubscription *s;
-  NtpTime         deadline, minimumSeparation;
+  NtpTime         deadline = NTPTIME_INITIALIZER(3), minimumSeparation = NTPTIME_INITIALIZER(0);
 
   ORTEInit();
   //ORTEVerbositySetOptions("ALL,10");
   d = ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN, NULL, NULL, ORTE_FALSE);
   ORTETypeRegisterAdd(d, "HelloMsg", NULL, NULL, NULL, sizeof(instance2Recv));
-  NTPTIME_BUILD(deadline, 3);
-  NTPTIME_BUILD(minimumSeparation, 0);
   s = ORTESubscriptionCreate(
     d,
     IMMEDIATE,

diff --git a/orte/examples/reliable/r_subscriber_reliable.c b/orte/examples/reliable/r_subscriber_reliable.c
index 953c5a16afdb92caf830573dd2aadc4b3453c0da..d937f672a3369e9b05ee0c8703a6a796b344f0b6 100644 (file)
--- a/orte/examples/reliable/r_subscriber_reliable.c
+++ b/orte/examples/reliable/r_subscriber_reliable.c
@@ -63,14 +63,12 @@ int
 main(int argc, char *args[])
 {
   ORTESubscription *s;
-  NtpTime         deadline, minimumSeparation;
+  NtpTime         deadline = NTPTIME_INITIALIZER(3), minimumSeparation = NTPTIME_INITIALIZER(0);
 
   ORTEInit();
   //ORTEVerbositySetOptions("ALL,10");
   d = ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN, NULL, NULL, ORTE_FALSE);
   ORTETypeRegisterAdd(d, "HelloMsg", NULL, NULL, NULL, sizeof(instance2Recv));
-  NTPTIME_BUILD(deadline, 3);
-  NTPTIME_BUILD(minimumSeparation, 0);
   s = ORTESubscriptionCreate(
     d,
     IMMEDIATE,

diff --git a/orte/examples/schneider/schneider_subscriber.c b/orte/examples/schneider/schneider_subscriber.c
index ac560435f321f5efa02d30bde220ebf25bd2cfde..288d5cb87eb6943e915ce131beea63fd76b1b072 100644 (file)
--- a/orte/examples/schneider/schneider_subscriber.c
+++ b/orte/examples/schneider/schneider_subscriber.c
@@ -65,11 +65,9 @@ static void *
 subscriberCreate(void *arg)
 {
   ORTESubscription    *s;
-  NtpTime             deadline, minimumSeparation;
+  NtpTime             deadline = NTPTIME_INITIALIZER(10), minimumSeparation = NTPTIME_INITIALIZER(0);
 
   ORTETypeRegisterAdd(d, "IDA_OCTETSTRING", NULL, NULL, maxDataSize, sizeof(instance2Recv));
-  NTPTIME_BUILD(deadline, 10);
-  NTPTIME_BUILD(minimumSeparation, 0);
   s = ORTESubscriptionCreate(
     d,
     IMMEDIATE,