Changeset 1113c9e in mainline for uspace/app/sbi/src/run_texpr.c

Timestamp:

2010-06-09T19:03:24Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8eec3c8

Parents:

8f80c77 (diff), c5cb943d (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 from lp:~jsvoboda/helenos/sysel.

File:

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

uspace/app/sbi/src/run_texpr.c

@@ -140 +140 @@
         }
 
+        /* Make compiler happy. */
+        titem = NULL;
+
         switch (sym->sc) {
         case sc_csi:
@@ -147 +150 @@
                 titem->u.tobject = tobject;
 
-                tobject->static_ref = b_false;
+                tobject->static_ref = sn_nonstatic;
                 tobject->csi = sym->u.csi;
                 list_init(&tobject->targs);
@@ -278 +281 @@
         (void) tliteral;
 
+        /* Make compiler happy. */
+        tpc = 0;
+
         switch (tliteral->tlc) {
         case tlc_bool: tpc = tpc_bool; break;
@@ -342 +348 @@
         }
 
+        /* Make compiler happy. */
+        titem = NULL;
+
         switch (sym->sc) {
         case sc_csi:
@@ -349 +358 @@
                 titem->u.tobject = tobject;
 
-                tobject->static_ref = b_false;
+                tobject->static_ref = sn_nonstatic;
                 tobject->csi = sym->u.csi;
                 list_init(&tobject->targs);
@@ -429 +438 @@
 
         list_node_t *farg_n;
-        stree_targ_t *farg;
 
 #ifdef DEBUG_RUN_TRACE
@@ -450 +458 @@
         }
 
-        tobject->static_ref = b_false;
+        tobject->static_ref = sn_nonstatic;
         tobject->csi = base_ti->u.tobject->csi;
         list_init(&tobject->targs);
@@ -458 +466 @@
         arg_n = list_first(&tapply->targs);
         while (farg_n != NULL && arg_n != NULL) {
-                farg = list_node_data(farg_n, stree_targ_t *);
                 arg = list_node_data(arg_n, stree_texpr_t *);