Changeset 5a6cc679 in mainline for uspace/lib/label/include

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

Location:

uspace/lib/label/include

Files:

• label/empty.h (modified) (1 diff)
• label/label.h (modified) (2 diffs)
• types/liblabel.h (modified) (2 diffs)

uspace/lib/label/include/label/empty.h

@@ -41 +41 @@
 #include <types/liblabel.h>
 
-extern int label_bd_is_empty(label_bd_t *, bool *);
-extern int label_bd_empty(label_bd_t *);
-extern int label_part_empty(label_part_t *);
+extern errno_t label_bd_is_empty(label_bd_t *, bool *);
+extern errno_t label_bd_empty(label_bd_t *);
+extern errno_t label_part_empty(label_part_t *);
 
 #endif

uspace/lib/label/include/label/label.h

@@ -40 +40 @@
 #include <types/liblabel.h>
 
-extern int label_open(label_bd_t *, label_t **);
-extern int label_create(label_bd_t *, label_type_t, label_t **);
+extern errno_t label_open(label_bd_t *, label_t **);
+extern errno_t label_create(label_bd_t *, label_type_t, label_t **);
 extern void label_close(label_t *);
-extern int label_destroy(label_t *);
-extern int label_get_info(label_t *, label_info_t *);
+extern errno_t label_destroy(label_t *);
+extern errno_t label_get_info(label_t *, label_info_t *);
 
 extern label_part_t *label_part_first(label_t *);
@@ -50 +50 @@
 extern void label_part_get_info(label_part_t *, label_part_info_t *);
 
-extern int label_part_create(label_t *, label_part_spec_t *,
+extern errno_t label_part_create(label_t *, label_part_spec_t *,
     label_part_t **);
-extern int label_part_destroy(label_part_t *);
+extern errno_t label_part_destroy(label_part_t *);
 extern void label_pspec_init(label_part_spec_t *);
-extern int label_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
+extern errno_t label_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
 
 #endif

uspace/lib/label/include/types/liblabel.h

@@ -54 +54 @@
 /** Ops for individual label type */
 typedef struct {
-        int (*open)(label_bd_t *, label_t **);
-        int (*create)(label_bd_t *, label_t **);
+        errno_t (*open)(label_bd_t *, label_t **);
+        errno_t (*create)(label_bd_t *, label_t **);
         void (*close)(label_t *);
-        int (*destroy)(label_t *);
-        int (*get_info)(label_t *, label_info_t *);
+        errno_t (*destroy)(label_t *);
+        errno_t (*get_info)(label_t *, label_info_t *);
         label_part_t *(*part_first)(label_t *);
         label_part_t *(*part_next)(label_part_t *);
         void (*part_get_info)(label_part_t *, label_part_info_t *);
-        int (*part_create)(label_t *, label_part_spec_t *, label_part_t **);
-        int (*part_destroy)(label_part_t *);
-        int (*suggest_ptype)(label_t *, label_pcnt_t, label_ptype_t *);
+        errno_t (*part_create)(label_t *, label_part_spec_t *, label_part_t **);
+        errno_t (*part_destroy)(label_part_t *);
+        errno_t (*suggest_ptype)(label_t *, label_pcnt_t, label_ptype_t *);
 } label_ops_t;
 
@@ -144 +144 @@
 struct label_bd_ops {
         /** Get block size */
-        int (*get_bsize)(void *, size_t *);
+        errno_t (*get_bsize)(void *, size_t *);
         /** Get number of blocks */
-        int (*get_nblocks)(void *, aoff64_t *);
+        errno_t (*get_nblocks)(void *, aoff64_t *);
         /** Read blocks */
-        int (*read)(void *, aoff64_t, size_t, void *);
+        errno_t (*read)(void *, aoff64_t, size_t, void *);
         /** Write blocks */
-        int (*write)(void *, aoff64_t, size_t, const void *);
+        errno_t (*write)(void *, aoff64_t, size_t, const void *);
 };