From 827b0f747b2aa4870ef8de90cb0c3a4151e5ce71 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Thu, 29 Jan 2015 13:57:23 +0000
Subject: py: Change vstr_null_terminate -> vstr_null_terminated_str, returns
 str.

---
 stmhal/pyexec.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'stmhal')

diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c
index 930c1c019..eaad6b5d7 100644
--- a/stmhal/pyexec.c
+++ b/stmhal/pyexec.c
@@ -248,8 +248,7 @@ int pyexec_friendly_repl_process_char(int c) {
             return 0;
         }
 
-        vstr_null_terminate(&repl.line);
-        if (!mp_repl_continue_with_input(vstr_str(&repl.line))) {
+        if (!mp_repl_continue_with_input(vstr_null_terminated_str(&repl.line))) {
             goto exec;
         }
 
@@ -275,8 +274,7 @@ int pyexec_friendly_repl_process_char(int c) {
             return 0;
         }
 
-        vstr_null_terminate(&repl.line);
-        if (mp_repl_continue_with_input(vstr_str(&repl.line))) {
+        if (mp_repl_continue_with_input(vstr_null_terminated_str(&repl.line))) {
             vstr_add_byte(&repl.line, '\n');
             stdout_tx_str("... ");
             readline_note_newline();
@@ -364,11 +362,7 @@ friendly_repl_reset:
             continue;
         }
 
-        for (;;) {
-            vstr_null_terminate(&line);
-            if (!mp_repl_continue_with_input(vstr_str(&line))) {
-                break;
-            }
+        while (mp_repl_continue_with_input(vstr_null_terminated_str(&line))) {
             vstr_add_byte(&line, '\n');
             ret = readline(&line, "... ");
             if (ret == CHAR_CTRL_C) {
-- 
cgit v1.2.3