Changeset 1113c9e in mainline for uspace/app/sbi/src/builtin/bi_string.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/builtin/bi_string.c (modified) (3 diffs)

uspace/app/sbi/src/builtin/bi_string.c

@@ -116 +116 @@
         rdata_var_t *self_value_var;
         const char *str;
+        const char *slice;
         size_t str_l;
 
@@ -125 +126 @@
 
         int rc;
-
-        rdata_string_t *rstring;
-        rdata_var_t *rvar;
-        rdata_value_t *rval;
-        rdata_item_t *ritem;
-
-        run_proc_ar_t *proc_ar;
 
         /* Extract self.Value */
@@ -165 +159 @@
             start, length, str);
 #endif
-        /* Construct return value. */
-        rstring = rdata_string_new();
-        rstring->value = os_str_aslice(str, start, length);
+        slice = os_str_aslice(str, start, length);
 
-        rvar = rdata_var_new(vc_string);
-        rvar->u.string_v = rstring;
-        rval = rdata_value_new();
-        rval->var = rvar;
-
-        ritem = rdata_item_new(ic_value);
-        ritem->u.value = rval;
-
-        proc_ar = run_get_current_proc_ar(run);
-        proc_ar->retval = ritem;
+        /* Ownership of slice is transferred. */
+        builtin_return_string(run, slice);
 }