summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-06-03 19:25:37 +0100
committerDamien George <damien.p.george@gmail.com>2014-06-03 19:25:37 +0100
commit9b967dd3cdcce8cd04f1b09b2a80c3a64eeb459e (patch)
tree81ef52131b6afb671715ff57fa0bed2f7572bc5c /py
parentb294a7e3c9b84aad6c331128a51e0d69e7845141 (diff)
parent4867413e6900c10ed8aa665ed4249e0ccc535e1f (diff)
downloadmicropython-9b967dd3cdcce8cd04f1b09b2a80c3a64eeb459e.tar.gz
micropython-9b967dd3cdcce8cd04f1b09b2a80c3a64eeb459e.zip
Merge pull request #655 from Rosuav/master
Two small changes
Diffstat (limited to 'py')
-rw-r--r--py/objstr.c2
-rw-r--r--py/qstr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/py/objstr.c b/py/objstr.c
index 9ff9106375..440f6347e7 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -68,7 +68,7 @@ void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *e
// this escapes characters, but it will be very slow to print (calling print many times)
bool has_single_quote = false;
bool has_double_quote = false;
- for (const byte *s = str_data, *top = str_data + str_len; (!has_single_quote || !has_double_quote) && s < top; s++) {
+ for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
if (*s == '\'') {
has_single_quote = true;
} else if (*s == '"') {
diff --git a/py/qstr.h b/py/qstr.h
index fc93fe2c2a..9803e672ca 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
-// See qstrraw.h for a list of qstr's that are available as constants.
+// See qstrdefs.h for a list of qstr's that are available as constants.
// Reference them as MP_QSTR_xxxx.
//
// Note: it would be possible to define MP_QSTR_xxx as qstr_from_str_static("xxx")