virJSONValueObjectAddVArgs: Add 'k' convertor for formatting non-negative integers

In many cases we use a signed value, but use the sign to note that it
was not assigned. For converting to JSON objects it will be handy to
have possibility to do this automatically.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/util/virjson.c b/src/util/virjson.c
index 9adcea4fff6e89e245768d16782a7f73f91ccb3a..26491bd6c73801a1fa3a32dbd99408b2820df67b 100644 (file)
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -115,6 +115,7 @@ virJSONValueGetType(const virJSONValue *value)
  *
  * i: signed integer value
  * j: signed integer value, error if negative
+ * k: signed integer value, omitted if negative
  * z: signed integer value, omitted if zero
  * y: signed integer value, omitted if zero, error if negative
  *
@@ -189,6 +190,7 @@ virJSONValueObjectAddVArgs(virJSONValue *obj,
 
         case 'z':
         case 'y':
+        case 'k':
         case 'j':
         case 'i': {
             int val = va_arg(args, int);
@@ -203,6 +205,9 @@ virJSONValueObjectAddVArgs(virJSONValue *obj,
             if (!val && (type == 'z' || type == 'y'))
                 continue;
 
+            if (val < 0 && type == 'k')
+                continue;
+
             rc = virJSONValueObjectAppendNumberInt(obj, key, val);
         }   break;