Changeset 32786

Timestamp:

2012-07-20T17:05:30+02:00 (6 years ago)

Author:

jow

Message:

[package] owipcalc: fix output formatting quirks

File:

• trunk/package/owipcalc/src/owipcalc.c (modified) (8 diffs)

trunk/package/owipcalc/src/owipcalc.c

@@ -225 +225 @@
         uint32_t net2 = b->addr.v4.s_addr & htonl(~((1 << (32 - a->prefix)) - 1));
 
+        if (printed)
+                qprintf(" ");
+
         if ((b->prefix >= a->prefix) && (net1 == net2))
         {
-                qprintf("1\n");
+                qprintf("1");
                 return true;
         }
         else
         {
-                qprintf("0\n");
+                qprintf("0");
                 return false;
         }
@@ -250 +253 @@
 {
         uint32_t x = ntohl(a->addr.v4.s_addr);
+
+        if (printed)
+                qprintf(" ");
 
         if (((x >= 0x0A000000) && (x <= 0x0AFFFFFF)) ||
@@ -255 +261 @@
             ((x >= 0xC0A80000) && (x <= 0xC0A8FFFF)))
         {
-                qprintf("1\n");
+                qprintf("1");
                 return true;
         }
         else
         {
-                qprintf("0\n");
+                qprintf("0");
                 return false;
         }
@@ -269 +275 @@
         uint32_t x = ntohl(a->addr.v4.s_addr);
 
+        if (printed)
+                qprintf(" ");
+
         if ((x >= 0xA9FE0000) && (x <= 0xA9FEFFFF))
         {
-                qprintf("1\n");
+                qprintf("1");
                 return true;
         }
         else
         {
-                qprintf("0\n");
+                qprintf("0");
                 return false;
         }
@@ -527 +536 @@
         uint8_t net2 = y->s6_addr[15-i] & m;
 
+        if (printed)
+                qprintf(" ");
+
         if ((b->prefix >= n->prefix) && (net1 == net2) &&
             ((i == 15) || !memcmp(&x->s6_addr, &y->s6_addr, 15-i)))
         {
-                qprintf("1\n");
+                qprintf("1");
                 return true;
         }
         else
         {
-                qprintf("0\n");
+                qprintf("0");
                 return false;
         }
@@ -542 +554 @@
 static bool cidr_linklocal6(struct cidr *a)
 {
+        if (printed)
+                qprintf(" ");
+
         if ((a->addr.v6.s6_addr[0] == 0xFE) &&
             (a->addr.v6.s6_addr[1] >= 0x80) &&
             (a->addr.v6.s6_addr[1] <= 0xBF))
         {
-                qprintf("1\n");
+                qprintf("1");
                 return true;
         }
         else
         {
-                qprintf("0\n");
+                qprintf("0");
                 return false;
         }
@@ -558 +573 @@
 static bool cidr_ula6(struct cidr *a)
 {
+        if (printed)
+                qprintf(" ");
+
         if ((a->addr.v6.s6_addr[0] >= 0xFC) &&
             (a->addr.v6.s6_addr[0] <= 0xFD))
         {
-                qprintf("1\n");
+                qprintf("1");
                 return true;
         }
         else
         {
-                qprintf("0\n");
+                qprintf("0");
                 return false;
         }
@@ -653 +671 @@
 static bool cidr_howmany(struct cidr *a, struct cidr *b)
 {
+        if (printed)
+                qprintf(" ");
+
         if (b->prefix < a->prefix)
-                qprintf("0\n");
+                qprintf("0");
         else
-                qprintf("%u\n", 1 << (b->prefix - a->prefix));
+                qprintf("%u", 1 << (b->prefix - a->prefix));
 
         return true;