Changeset 1dcba91 in mainline for uspace/app/contacts/contacts.c

Timestamp:

2018-08-08T10:08:53Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44428bb

Parents:

7ab7075f

git-author:

Jiri Svoboda <jiri@…> (2018-08-07 17:07:59)

git-committer:

Jiri Svoboda <jiri@…> (2018-08-08 10:08:53)

Message:

Configuration repository for volume server.

File:

• uspace/app/contacts/contacts.c (modified) (3 diffs)

uspace/app/contacts/contacts.c

@@ -78 +78 @@
 } contact_action_t;
 
-static errno_t contacts_unmarshal(sif_node_t *, contacts_t *);
+static errno_t contacts_load(sif_node_t *, contacts_t *);
 static contacts_entry_t *contacts_first(contacts_t *);
 static contacts_entry_t *contacts_next(contacts_entry_t *);
@@ -150 +150 @@
                 }
 
-                rc = contacts_unmarshal(node, contacts);
-                if (rc != EOK)
-                        goto error;
-
-                contacts->nentries = node;
+                rc = contacts_load(node, contacts);
+                if (rc != EOK)
+                        goto error;
         }
 
@@ -171 +169 @@
 }
 
-/** Unmarshal contact entries from SIF repository.
+/** Load contact entries from SIF repository.
  *
  * @param nentries Entries node
- * @param contacts Contacts object to unmarshal to
+ * @param contacts Contacts object to load to
  * @return EOK on success or error code
  */
-static errno_t contacts_unmarshal(sif_node_t *nentries, contacts_t *contacts)
+static errno_t contacts_load(sif_node_t *nentries, contacts_t *contacts)
 {
         sif_node_t *nentry;