py/vstr: Combine vstr_new_size with vstr_new since they are rarely used.

dpgeorge · dpgeorge · commit 824f5c5a32d7 · 2016-10-14T16:46:34.000+11:00
Now there is just one function to allocate a new vstr, namely vstr_new
(in addition to vstr_init etc).  The caller of this function should know
what initial size to allocate for the buffer, or at least have some policy
or config option, instead of leaving it to a default (as it was before).
diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
@@ -148,7 +148,7 @@ STATIC int pyexec_raw_repl_process_char(int c);
 STATIC int pyexec_friendly_repl_process_char(int c);
 
 void pyexec_event_repl_init(void) {
-    MP_STATE_VM(repl_line) = vstr_new_size(32);
+    MP_STATE_VM(repl_line) = vstr_new(32);
     repl.cont_line = false;
     readline_init(MP_STATE_VM(repl_line), ">>> ");
     if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
diff --git a/py/misc.h b/py/misc.h
@@ -151,8 +151,7 @@ void vstr_init_fixed_buf(vstr_t *vstr, size_t alloc, char *buf);
 struct _mp_print_t;
 void vstr_init_print(vstr_t *vstr, size_t alloc, struct _mp_print_t *print);
 void vstr_clear(vstr_t *vstr);
-vstr_t *vstr_new(void);
-vstr_t *vstr_new_size(size_t alloc);
+vstr_t *vstr_new(size_t alloc);
 void vstr_free(vstr_t *vstr);
 static inline void vstr_reset(vstr_t *vstr) { vstr->len = 0; }
 static inline char *vstr_str(vstr_t *vstr) { return vstr->buf; }
diff --git a/py/objstringio.c b/py/objstringio.c
@@ -150,7 +150,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stringio___exit___obj, 4, 4, stringio
 STATIC mp_obj_stringio_t *stringio_new(const mp_obj_type_t *type) {
     mp_obj_stringio_t *o = m_new_obj(mp_obj_stringio_t);
     o->base.type = type;
-    o->vstr = vstr_new();
+    o->vstr = vstr_new(16);
     o->pos = 0;
     return o;
 }
diff --git a/py/vstr.c b/py/vstr.c
@@ -74,20 +74,8 @@ void vstr_clear(vstr_t *vstr) {
     vstr->buf = NULL;
 }
 
-vstr_t *vstr_new(void) {
+vstr_t *vstr_new(size_t alloc) {
     vstr_t *vstr = m_new_obj(vstr_t);
-    if (vstr == NULL) {
-        return NULL;
-    }
-    vstr_init(vstr, 16);
-    return vstr;
-}
-
-vstr_t *vstr_new_size(size_t alloc) {
-    vstr_t *vstr = m_new_obj(vstr_t);
-    if (vstr == NULL) {
-        return NULL;
-    }
     vstr_init(vstr, alloc);
     return vstr;
 }
diff --git a/teensy/main.c b/teensy/main.c
@@ -317,7 +317,7 @@ int main(void) {
     pyexec_frozen_module("main.py");
 #else
     {
-        vstr_t *vstr = vstr_new();
+        vstr_t *vstr = vstr_new(16);
         vstr_add_str(vstr, "/");
         if (pyb_config_main == MP_OBJ_NULL) {
             vstr_add_str(vstr, "main.py");
diff --git a/unix/coverage.c b/unix/coverage.c
@@ -34,7 +34,7 @@ STATIC mp_obj_t extra_coverage(void) {
     // vstr
     {
         mp_printf(&mp_plat_print, "# vstr\n");
-        vstr_t *vstr = vstr_new_size(16);
+        vstr_t *vstr = vstr_new(16);
         vstr_hint_size(vstr, 32);
         vstr_add_str(vstr, "ts");
         vstr_ins_byte(vstr, 1, 'e');

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stringio___exit___obj, 4, 4, stringio`
`150`	`150`	`STATIC mp_obj_stringio_t stringio_new(const mp_obj_type_t type) {`
`151`	`151`	`mp_obj_stringio_t *o = m_new_obj(mp_obj_stringio_t);`
`152`	`152`	`o->base.type = type;`
`153`		`- o->vstr = vstr_new();`
	`153`	`+ o->vstr = vstr_new(16);`
`154`	`154`	`o->pos = 0;`
`155`	`155`	`return o;`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ int main(void) {`
`317`	`317`	`pyexec_frozen_module("main.py");`
`318`	`318`	`#else`
`319`	`319`	`{`
`320`		`- vstr_t *vstr = vstr_new();`
	`320`	`+ vstr_t *vstr = vstr_new(16);`
`321`	`321`	`vstr_add_str(vstr, "/");`
`322`	`322`	`if (pyb_config_main == MP_OBJ_NULL) {`
`323`	`323`	`vstr_add_str(vstr, "main.py");`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ STATIC mp_obj_t extra_coverage(void) {`
`34`	`34`	`// vstr`
`35`	`35`	`{`
`36`	`36`	`mp_printf(&mp_plat_print, "# vstr\n");`
`37`		`- vstr_t *vstr = vstr_new_size(16);`
	`37`	`+ vstr_t *vstr = vstr_new(16);`
`38`	`38`	`vstr_hint_size(vstr, 32);`
`39`	`39`	`vstr_add_str(vstr, "ts");`
`40`	`40`	`vstr_ins_byte(vstr, 1, 'e');`