Changeset 978ccaf1 in mainline for uspace/app/bithenge/file.c

Timestamp:

2012-06-27T03:35:43Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

600f5d1

Parents:

04a7435f

Message:

Bithenge: various cleanup and tweaks

File:

• uspace/app/bithenge/file.c (modified) (6 diffs)

uspace/app/bithenge/file.c

@@ -55 +55 @@
 } file_blob_t;
 
-static inline file_blob_t *file_from_blob(bithenge_blob_t *base)
+static inline file_blob_t *blob_as_file(bithenge_blob_t *base)
 {
         return (file_blob_t *)base;
 }
 
-static inline bithenge_blob_t *blob_from_file(file_blob_t *blob)
+static inline bithenge_blob_t *file_as_blob(file_blob_t *blob)
 {
         return &blob->base;
@@ -67 +67 @@
 static int file_size(bithenge_blob_t *base, aoff64_t *size)
 {
-        file_blob_t *blob = file_from_blob(base);
+        file_blob_t *blob = blob_as_file(base);
         *size = blob->size;
         return EOK;
@@ -75 +75 @@
     aoff64_t *size)
 {
-        file_blob_t *blob = file_from_blob(base);
+        file_blob_t *blob = blob_as_file(base);
         if (offset > blob->size)
                 return ELIMIT;
@@ -95 +95 @@
 }
 
-static int file_destroy(bithenge_blob_t *base)
+static void file_destroy(bithenge_blob_t *base)
 {
-        file_blob_t *blob = file_from_blob(base);
+        file_blob_t *blob = blob_as_file(base);
         close(blob->fd);
         free(blob);
-        return EOK;
 }
 
@@ -128 +127 @@
                 return ENOMEM;
         }
-        rc = bithenge_new_random_access_blob(blob_from_file(blob),
-            &file_ops);
+        rc = bithenge_init_random_access_blob(file_as_blob(blob), &file_ops);
         if (rc != EOK) {
                 free(blob);
@@ -143 +141 @@
 #endif
         blob->needs_close = needs_close;
-        *out = bithenge_blob_as_node(blob_from_file(blob));
+        *out = bithenge_blob_as_node(file_as_blob(blob));
 
         return EOK;