[sr-dev] git:master: xmlrpc: initial support for 'u' specifier

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: 241d6387989be258880131e578598591869a3645
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=241d6387989be258880131e578598591869a3645

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Wed Sep  3 09:46:41 2014 +0200

xmlrpc: initial support for 'u' specifier

- auto-convert to unsigned int

---

 modules/xmlrpc/xmlrpc.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c
index 634c1e8..e97a3f3 100644
--- a/modules/xmlrpc/xmlrpc.c
+++ b/modules/xmlrpc/xmlrpc.c
@@ -1013,6 +1013,12 @@ static int print_value(struct xmlrpc_reply* res,
 		body.s = sint2str(va_arg(*ap, int), &body.len);
 		break;
 
+	case 'u':
+		prefix = int_prefix;
+		suffix = int_suffix;
+		body.s = int2str(va_arg(*ap, unsigned int), &body.len);
+		break;
+
 	case 'f':
 		prefix = double_prefix;
 		suffix = double_suffix;
@@ -1501,7 +1507,9 @@ static int get_string(char** val, struct xmlrpc_reply* reply,
 static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...)
 {
 	int read;
+	int ival;
 	int* int_ptr;
+	unsigned int* uint_ptr;
 	char** char_ptr;
 	str* str_ptr;
 	double* double_ptr;
@@ -1548,6 +1556,12 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...)
 			int_ptr = va_arg(ap, int*);
 			if (get_int(int_ptr, reply, ctx->doc, value, f) < 0) goto error;
 			break;
+
+		case 'u': /* Integer */
+			uint_ptr = va_arg(ap, unsigned int*);
+			if (get_int(&ival, reply, ctx->doc, value, f) < 0) goto error;
+			*uint_ptr = (unsigned int)ival;
+			break;
 			
 		case 'f': /* double */
 			double_ptr = va_arg(ap, double*);
@@ -1898,8 +1912,10 @@ static int rpc_struct_printf(struct rpc_struct* s, char* member_name,
 static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...)
 {
 	int read;
+	int ival;
 	va_list ap;
 	int* int_ptr;
+	unsigned int* uint_ptr;
 	double* double_ptr;
 	char** char_ptr;
 	str* str_ptr;
@@ -1929,6 +1945,12 @@ static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...)
 			if (get_int(int_ptr, reply, s->doc, value, f) < 0) goto error;
 			break;
 
+		case 'u': /* Integer */
+			uint_ptr = va_arg(ap, unsigned int*);
+			if (get_int(&ival, reply, s->doc, value, f) < 0) goto error;
+			*uint_ptr = (unsigned int)ival;
+			break;
+			
 		case 'f': /* double */
 			double_ptr = va_arg(ap, double*);
 			if (get_double(double_ptr, reply, s->doc, value, f) < 0)