commit 044c473de203b4dbe93874813b430fb6336db2b2
author Damien George <damien.p.george@gmail.com> Sat Apr 11 13:03:37 2015 +0100
committer Damien George <damien.p.george@gmail.com> Thu Apr 16 14:30:16 2015 +0000
tree f632b62412031458b7a9438fa144ef5a6ebd1f66
parent e72cda99fd5fc9e7c6476eb8574c4401d3ef9560

py: Add %q format support to mp_[v]printf, and use it.

py/objexcept.c

diff --git a/py/objexcept.c b/py/objexcept.c
index 8a008d1..4623e73 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -95,7 +95,7 @@
     mp_print_kind_t k = kind & ~PRINT_EXC_SUBCLASS;
     bool is_subclass = kind & PRINT_EXC_SUBCLASS;
     if (!is_subclass && (k == PRINT_REPR || k == PRINT_EXC)) {
-        mp_printf(print, "%s", qstr_str(o->base.type->name));
+        mp_print_str(print, qstr_str(o->base.type->name));
     }
 
     if (k == PRINT_EXC) {
@@ -321,13 +321,17 @@
             uint max_len = MP_STATE_VM(mp_emergency_exception_buf) + mp_emergency_exception_buf_size
                          - str_data;
 
+            vstr_t vstr;
+            vstr_init_fixed_buf(&vstr, max_len, (char *)str_data);
+
             va_list ap;
             va_start(ap, fmt);
-            str->len = vsnprintf((char *)str_data, max_len, fmt, ap);
+            vstr_vprintf(&vstr, fmt, ap);
             va_end(ap);
 
             str->base.type = &mp_type_str;
             str->hash = qstr_compute_hash(str_data, str->len);
+            str->len = vstr.len;
             str->data = str_data;
 
             o->args = tuple;