This is similar to ovs_scan but takes int pointer as extra
parameter, this pointer point to starting index of the string.
On successful scan this API stores number of characters
scanned. This API is useful for parsing complex odp actions
e.g. tun_push action.
Signed-off-by: Pravin B Shelar <pshe...@nicira.com>
---
lib/util.c | 61 ++++++++++++++++++++++++++++++++++++++++++++---------------
lib/util.h | 1 +
2 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/lib/util.c b/lib/util.c
index fb2ff51..099b81f 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -1625,16 +1625,15 @@ scan_chars(const char *s, const struct scan_spec *spec,
va_list *args)
* also not supported.
*
* - %p is not supported.
+ * - Extra parameter `n` is added to return number of scanned characters.
*/
-bool
-ovs_scan(const char *s, const char *format, ...)
+static bool
+ovs_scan__(const char *s, int *n, const char *format, va_list *args)
{
const char *const start = s;
bool ok = false;
const char *p;
- va_list args;
- va_start(args, format);
p = format;
while (*p != '\0') {
struct scan_spec spec;
@@ -1729,24 +1728,24 @@ ovs_scan(const char *s, const char *format, ...)
}
switch (c) {
case 'd':
- s = scan_int(s, &spec, 10, &args);
+ s = scan_int(s, &spec, 10, args);
break;
case 'i':
- s = scan_int(s, &spec, 0, &args);
+ s = scan_int(s, &spec, 0, args);
break;
case 'o':
- s = scan_int(s, &spec, 8, &args);
+ s = scan_int(s, &spec, 8, args);
break;
case 'u':
- s = scan_int(s, &spec, 10, &args);
+ s = scan_int(s, &spec, 10, args);
break;
case 'x':
case 'X':
- s = scan_int(s, &spec, 16, &args);
+ s = scan_int(s, &spec, 16, args);
break;
case 'e':
@@ -1754,24 +1753,24 @@ ovs_scan(const char *s, const char *format, ...)
case 'g':
case 'E':
case 'G':
- s = scan_float(s, &spec, &args);
+ s = scan_float(s, &spec, args);
break;
case 's':
- s = scan_string(s, &spec, &args);
+ s = scan_string(s, &spec, args);
break;
case '[':
- s = scan_set(s, &spec, &p, &args);
+ s = scan_set(s, &spec, &p, args);
break;
case 'c':
- s = scan_chars(s, &spec, &args);
+ s = scan_chars(s, &spec, args);
break;
case 'n':
if (spec.type != SCAN_DISCARD) {
- *va_arg(args, int *) = s - start;
+ *va_arg(*args, int *) = s - start;
}
break;
}
@@ -1780,13 +1779,43 @@ ovs_scan(const char *s, const char *format, ...)
goto exit;
}
}
- ok = true;
+ if (n) {
+ *n = s - start;
+ }
+ ok = true;
exit:
- va_end(args);
return ok;
}
+bool
+ovs_scan(const char *s, const char *format, ...)
+{
+ va_list args;
+ bool res;
+
+ va_start(args, format);
+ res = ovs_scan__(s, NULL, format, &args);
+ va_end(args);
+ return res;
+}
+
+bool
+ovs_scan_len(const char *s, int *n, const char *format, ...)
+{
+ va_list args;
+ bool success;
+ int n1;
+
+ va_start(args, format);
+ success = ovs_scan__(s + *n, &n1, format, &args);
+ va_end(args);
+ if (success) {
+ *n = *n + n1;
+ }
+ return success;
+}
+
void
xsleep(unsigned int seconds)
{
diff --git a/lib/util.h b/lib/util.h
index 79501af..f971f3b 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -316,6 +316,7 @@ bool str_to_llong(const char *, int base, long long *);
bool str_to_uint(const char *, int base, unsigned int *);
bool ovs_scan(const char *s, const char *format, ...) SCANF_FORMAT(2, 3);
+bool ovs_scan_len(const char *s, int *n, const char *format, ...);
bool str_to_double(const char *, double *);
--
1.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
