Changeset dc5aa568 in mainline for uspace/app/edit/sheet.c

Timestamp:

2012-08-16T15:18:44Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ebbc8a74

Parents:

80d8885 (diff), 13c4fe0 (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

File:

• uspace/app/edit/sheet.c (modified) (3 diffs)

uspace/app/edit/sheet.c

@@ -57 +57 @@
 
 #include "sheet.h"
+#include "sheet_impl.h"
 
 enum {
@@ -66 +67 @@
 
 /** Initialize an empty sheet. */
-int sheet_init(sheet_t *sh)
-{
+int sheet_create(sheet_t **rsh)
+{
+        sheet_t *sh;
+
+        sh = calloc(1, sizeof(sheet_t));
+        if (sh == NULL)
+                return ENOMEM;
+
         sh->dbuf_size = INITIAL_SIZE;
         sh->text_size = 0;
@@ -77 +84 @@
         list_initialize(&sh->tags);
 
+        *rsh = sh;
         return EOK;
 }