Changeset 6843a9c in mainline for uspace/app/sbi/src/run_texpr.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/app/sbi/src/run_texpr.c (modified) (3 diffs)

uspace/app/sbi/src/run_texpr.c

@@ -98 +98 @@
 {
         stree_symbol_t *sym;
-        tdata_item_t *targ_i;
-        tdata_item_t *titem;
+        tdata_item_t *targ_i = NULL;
+        tdata_item_t *titem = NULL;;
         tdata_object_t *tobject;
         tdata_deleg_t *tdeleg;
@@ -139 +139 @@
                 return;
         }
-
-        /* Make compiler happy. */
-        titem = NULL;
 
         switch (sym->sc) {
@@ -222 +219 @@
     stree_tindex_t *tindex, tdata_item_t **res)
 {
-        tdata_item_t *base_ti;
+        tdata_item_t *base_ti = NULL;
         tdata_item_t *titem;
         tdata_array_t *tarray;