py: Use MP_OBJ_NULL instead of NULL when appropriate.

dpgeorge · dpgeorge · commit 83229d3ffe5f · 2015-11-20T14:09:20.000Z
diff --git a/py/map.c b/py/map.c
@@ -306,7 +306,7 @@ mp_obj_t mp_set_lookup(mp_set_t *set, mp_obj_t index, mp_map_lookup_kind_t looku
         if (lookup_kind & MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
             mp_set_rehash(set);
         } else {
-            return NULL;
+            return MP_OBJ_NULL;
         }
     }
     mp_uint_t hash = MP_OBJ_SMALL_INT_VALUE(mp_unary_op(MP_UNARY_OP_HASH, index));
diff --git a/py/objdict.c b/py/objdict.c
@@ -251,7 +251,7 @@ STATIC mp_obj_t dict_fromkeys(mp_uint_t n_args, const mp_obj_t *args) {
     mp_obj_t iter = mp_getiter(args[1]);
     mp_obj_t len = mp_obj_len_maybe(iter);
     mp_obj_t value = mp_const_none;
-    mp_obj_t next = NULL;
+    mp_obj_t next = MP_OBJ_NULL;
     mp_obj_t self_out;
 
     if (n_args > 2) {
@@ -374,7 +374,7 @@ STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw
         } else {
             // update from a generic iterable of pairs
             mp_obj_t iter = mp_getiter(args[1]);
-            mp_obj_t next = NULL;
+            mp_obj_t next = MP_OBJ_NULL;
             while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
                 mp_obj_t inneriter = mp_getiter(next);
                 mp_obj_t key = mp_iternext(inneriter);

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ mp_obj_t mp_set_lookup(mp_set_t *set, mp_obj_t index, mp_map_lookup_kind_t looku`
`306`	`306`	`if (lookup_kind & MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {`
`307`	`307`	`mp_set_rehash(set);`
`308`	`308`	`} else {`
`309`		`- return NULL;`
	`309`	`+ return MP_OBJ_NULL;`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`	`mp_uint_t hash = MP_OBJ_SMALL_INT_VALUE(mp_unary_op(MP_UNARY_OP_HASH, index));`