Changeset b7fd2a0 in mainline for uspace/lib/bithenge/include


Ignore:
Timestamp:
2018-01-13T03:10:29Z (8 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a53ed3a
Parents:
36f0738
Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:
uspace/lib/bithenge/include/bithenge
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/bithenge/include/bithenge/blob.h

    r36f0738 rb7fd2a0  
    5353typedef struct bithenge_random_access_blob_ops_t {
    5454        /** @copydoc bithenge_blob_t::bithenge_blob_size */
    55         int (*size)(bithenge_blob_t *self, aoff64_t *size);
     55        errno_t (*size)(bithenge_blob_t *self, aoff64_t *size);
    5656        /** @copydoc bithenge_blob_t::bithenge_blob_read */
    57         int (*read)(bithenge_blob_t *self, aoff64_t offset, char *buffer,
     57        errno_t (*read)(bithenge_blob_t *self, aoff64_t offset, char *buffer,
    5858            aoff64_t *size);
    5959        /** @copydoc bithenge_blob_t::bithenge_blob_read_bits */
    60         int (*read_bits)(bithenge_blob_t *self, aoff64_t offset, char *buffer,
     60        errno_t (*read_bits)(bithenge_blob_t *self, aoff64_t offset, char *buffer,
    6161            aoff64_t *size, bool little_endian);
    6262        /** Destroy the blob.
    … …  
    9494         * @return EOK on success or an error code from errno.h.
    9595         */
    96         int (*size)(bithenge_sequential_blob_t *self, aoff64_t *size);
     96        errno_t (*size)(bithenge_sequential_blob_t *self, aoff64_t *size);
    9797
    9898        /** Read the next part of the blob. If the requested data extends
    … …  
    108108         * @return EOK on success or an error code from errno.h.
    109109         */
    110         int (*read)(bithenge_sequential_blob_t *self, char *buffer,
     110        errno_t (*read)(bithenge_sequential_blob_t *self, char *buffer,
    111111            aoff64_t *size);
    112112
    … …  
    123123 * @return EOK on success or an error code from errno.h.
    124124 */
    125 static inline int bithenge_blob_size(bithenge_blob_t *self, aoff64_t *size)
     125static inline errno_t bithenge_blob_size(bithenge_blob_t *self, aoff64_t *size)
    126126{
    127127        assert(self);
    … …  
    145145 * @return EOK on success or an error code from errno.h.
    146146 */
    147 static inline int bithenge_blob_read(bithenge_blob_t *self, aoff64_t offset,
     147static inline errno_t bithenge_blob_read(bithenge_blob_t *self, aoff64_t offset,
    148148    char *buffer, aoff64_t *size)
    149149{
    … …  
    173173 * @return EOK on success or an error code from errno.h.
    174174 */
    175 static inline int bithenge_blob_read_bits(bithenge_blob_t *self,
     175static inline errno_t bithenge_blob_read_bits(bithenge_blob_t *self,
    176176    aoff64_t offset, char *buffer, aoff64_t *size, bool little_endian)
    177177{
    … …  
    190190 * @param[out] out Holds whether the blob is empty.
    191191 * @return EOK on success or an error code from errno.h. */
    192 static inline int bithenge_blob_empty(bithenge_blob_t *self, bool *out)
     192static inline errno_t bithenge_blob_empty(bithenge_blob_t *self, bool *out)
    193193{
    194194        assert(self);
    195195        assert(self->base.blob_ops);
    196196        aoff64_t size;
    197         int rc = bithenge_blob_size(self, &size);
     197        errno_t rc = bithenge_blob_size(self, &size);
    198198        *out = size == 0;
    199199        return rc;
    … …  
    235235
    236236/** @memberof bithenge_blob_t */
    237 int bithenge_init_random_access_blob(bithenge_blob_t *,
     237errno_t bithenge_init_random_access_blob(bithenge_blob_t *,
    238238    const bithenge_random_access_blob_ops_t *);
    239239/** @memberof bithenge_sequential_blob_t */
    240 int bithenge_init_sequential_blob(bithenge_sequential_blob_t *,
     240errno_t bithenge_init_sequential_blob(bithenge_sequential_blob_t *,
    241241    const bithenge_sequential_blob_ops_t *);
    242242/** @memberof bithenge_blob_t */
    243 int bithenge_new_blob_from_data(bithenge_node_t **, const void *, size_t);
    244 /** @memberof bithenge_blob_t */
    245 int bithenge_new_blob_from_buffer(bithenge_node_t **, const void *, size_t,
     243errno_t bithenge_new_blob_from_data(bithenge_node_t **, const void *, size_t);
     244/** @memberof bithenge_blob_t */
     245errno_t bithenge_new_blob_from_buffer(bithenge_node_t **, const void *, size_t,
    246246    bool);
    247 int bithenge_new_offset_blob(bithenge_node_t **, bithenge_blob_t *, aoff64_t);
    248 int bithenge_new_subblob(bithenge_node_t **, bithenge_blob_t *, aoff64_t,
     247errno_t bithenge_new_offset_blob(bithenge_node_t **, bithenge_blob_t *, aoff64_t);
     248errno_t bithenge_new_subblob(bithenge_node_t **, bithenge_blob_t *, aoff64_t,
    249249    aoff64_t);
    250250/** @memberof bithenge_blob_t */
    251 int bithenge_blob_equal(bool *, bithenge_blob_t *, bithenge_blob_t *);
     251errno_t bithenge_blob_equal(bool *, bithenge_blob_t *, bithenge_blob_t *);
    252252
    253253#endif

  • uspace/lib/bithenge/include/bithenge/compound.h

    r36f0738 rb7fd2a0  
    4141#include "transform.h"
    4242
    43 int bithenge_new_composed_transform(bithenge_transform_t **,
     43errno_t bithenge_new_composed_transform(bithenge_transform_t **,
    4444    bithenge_transform_t **, size_t);
    45 int bithenge_if_transform(bithenge_transform_t **, bithenge_expression_t *,
     45errno_t bithenge_if_transform(bithenge_transform_t **, bithenge_expression_t *,
    4646    bithenge_transform_t *, bithenge_transform_t *);
    47 int bithenge_partial_transform(bithenge_transform_t **,
     47errno_t bithenge_partial_transform(bithenge_transform_t **,
    4848    bithenge_transform_t *);
    4949

  • uspace/lib/bithenge/include/bithenge/expression.h

    r36f0738 rb7fd2a0  
    5252typedef struct bithenge_expression_ops {
    5353        /** @copydoc bithenge_expression_t::bithenge_expression_evaluate */
    54         int (*evaluate)(bithenge_expression_t *self, bithenge_scope_t *scope,
     54        errno_t (*evaluate)(bithenge_expression_t *self, bithenge_scope_t *scope,
    5555            bithenge_node_t **out);
    5656        /** Destroy the expression.
    … …  
    8585 * @param[out] out Where the output tree will be stored.
    8686 * @return EOK on success or an error code from errno.h. */
    87 static inline int bithenge_expression_evaluate(bithenge_expression_t *self,
     87static inline errno_t bithenge_expression_evaluate(bithenge_expression_t *self,
    8888    bithenge_scope_t *scope, bithenge_node_t **out)
    8989{
    … …  
    117117} bithenge_binary_op_t;
    118118
    119 int bithenge_init_expression(bithenge_expression_t *,
     119errno_t bithenge_init_expression(bithenge_expression_t *,
    120120    const bithenge_expression_ops_t *);
    121 int bithenge_binary_expression(bithenge_expression_t **, bithenge_binary_op_t,
     121errno_t bithenge_binary_expression(bithenge_expression_t **, bithenge_binary_op_t,
    122122    bithenge_expression_t *, bithenge_expression_t *);
    123 int bithenge_in_node_expression(bithenge_expression_t **);
    124 int bithenge_current_node_expression(bithenge_expression_t **);
    125 int bithenge_param_expression(bithenge_expression_t **, int);
    126 int bithenge_const_expression(bithenge_expression_t **, bithenge_node_t *);
    127 int bithenge_scope_member_expression(bithenge_expression_t **,
     123errno_t bithenge_in_node_expression(bithenge_expression_t **);
     124errno_t bithenge_current_node_expression(bithenge_expression_t **);
     125errno_t bithenge_param_expression(bithenge_expression_t **, int);
     126errno_t bithenge_const_expression(bithenge_expression_t **, bithenge_node_t *);
     127errno_t bithenge_scope_member_expression(bithenge_expression_t **,
    128128    bithenge_node_t *);
    129 int bithenge_subblob_expression(bithenge_expression_t **,
     129errno_t bithenge_subblob_expression(bithenge_expression_t **,
    130130    bithenge_expression_t *, bithenge_expression_t *, bithenge_expression_t *,
    131131    bool);
    132 int bithenge_param_wrapper(bithenge_transform_t **, bithenge_transform_t *,
     132errno_t bithenge_param_wrapper(bithenge_transform_t **, bithenge_transform_t *,
    133133    bithenge_expression_t **);
    134 int bithenge_expression_transform(bithenge_transform_t **,
     134errno_t bithenge_expression_transform(bithenge_transform_t **,
    135135    bithenge_expression_t *);
    136 int bithenge_inputless_transform(bithenge_transform_t **,
     136errno_t bithenge_inputless_transform(bithenge_transform_t **,
    137137    bithenge_expression_t *);
    138138
    139 int bithenge_concat_blob(bithenge_node_t **, bithenge_blob_t *,
     139errno_t bithenge_concat_blob(bithenge_node_t **, bithenge_blob_t *,
    140140    bithenge_blob_t *);
    141 int bithenge_concat_blob_lazy(bithenge_node_t **, bithenge_blob_t *,
     141errno_t bithenge_concat_blob_lazy(bithenge_node_t **, bithenge_blob_t *,
    142142    bithenge_expression_t *, bithenge_scope_t *);
    143143

  • uspace/lib/bithenge/include/bithenge/file.h

    r36f0738 rb7fd2a0  
    4141#include "blob.h"
    4242
    43 int bithenge_new_file_blob(bithenge_node_t **, const char *);
    44 int bithenge_new_file_blob_from_fd(bithenge_node_t **, int);
    45 int bithenge_new_file_blob_from_file(bithenge_node_t **, FILE *);
     43errno_t bithenge_new_file_blob(bithenge_node_t **, const char *);
     44errno_t bithenge_new_file_blob_from_fd(bithenge_node_t **, int);
     45errno_t bithenge_new_file_blob_from_file(bithenge_node_t **, FILE *);
    4646
    4747#endif

  • uspace/lib/bithenge/include/bithenge/print.h

    r36f0738 rb7fd2a0  
    5050} bithenge_print_type_t;
    5151
    52 int bithenge_print_node(bithenge_print_type_t, bithenge_node_t *);
    53 int bithenge_print_node_to_string(char **, size_t *, bithenge_print_type_t,
     52errno_t bithenge_print_node(bithenge_print_type_t, bithenge_node_t *);
     53errno_t bithenge_print_node_to_string(char **, size_t *, bithenge_print_type_t,
    5454    bithenge_node_t *);
    5555

  • uspace/lib/bithenge/include/bithenge/script.h

    r36f0738 rb7fd2a0  
    4040#include "transform.h"
    4141
    42 int bithenge_parse_script(const char *, bithenge_transform_t **);
     42errno_t bithenge_parse_script(const char *, bithenge_transform_t **);
    4343
    4444#endif

  • uspace/lib/bithenge/include/bithenge/sequence.h

    r36f0738 rb7fd2a0  
    4040#include "transform.h"
    4141
    42 int bithenge_new_struct(bithenge_transform_t **,
     42errno_t bithenge_new_struct(bithenge_transform_t **,
    4343    bithenge_named_transform_t *);
    44 int bithenge_repeat_transform(bithenge_transform_t **, bithenge_transform_t *,
     44errno_t bithenge_repeat_transform(bithenge_transform_t **, bithenge_transform_t *,
    4545    bithenge_expression_t *);
    46 int bithenge_do_while_transform(bithenge_transform_t **,
     46errno_t bithenge_do_while_transform(bithenge_transform_t **,
    4747    bithenge_transform_t *, bithenge_expression_t *);
    4848

  • uspace/lib/bithenge/include/bithenge/source.h

    r36f0738 rb7fd2a0  
    4040#include "tree.h"
    4141
    42 int bithenge_node_from_source(bithenge_node_t **, const char *);
     42errno_t bithenge_node_from_source(bithenge_node_t **, const char *);
    4343
    4444#endif

  • uspace/lib/bithenge/include/bithenge/transform.h

    r36f0738 rb7fd2a0  
    7676typedef struct bithenge_transform_ops {
    7777        /** @copydoc bithenge_transform_t::bithenge_transform_apply */
    78         int (*apply)(bithenge_transform_t *self, bithenge_scope_t *scope,
     78        errno_t (*apply)(bithenge_transform_t *self, bithenge_scope_t *scope,
    7979            bithenge_node_t *in, bithenge_node_t **out);
    8080        /** @copydoc bithenge_transform_t::bithenge_transform_prefix_length */
    81         int (*prefix_length)(bithenge_transform_t *self,
     81        errno_t (*prefix_length)(bithenge_transform_t *self,
    8282            bithenge_scope_t *scope, bithenge_blob_t *blob, aoff64_t *out);
    8383        /** @copydoc bithenge_transform_t::bithenge_transform_prefix_apply */
    84         int (*prefix_apply)(bithenge_transform_t *self,
     84        errno_t (*prefix_apply)(bithenge_transform_t *self,
    8585            bithenge_scope_t *scope, bithenge_blob_t *blob,
    8686            bithenge_node_t **out_node, aoff64_t *out_size);
    … …  
    158158
    159159/** @memberof bithenge_transform_t */
    160 int bithenge_init_transform(bithenge_transform_t *,
     160errno_t bithenge_init_transform(bithenge_transform_t *,
    161161    const bithenge_transform_ops_t *, int);
    162162/** @memberof bithenge_transform_t */
    163 int bithenge_transform_apply(bithenge_transform_t *, bithenge_scope_t *,
     163errno_t bithenge_transform_apply(bithenge_transform_t *, bithenge_scope_t *,
    164164    bithenge_node_t *, bithenge_node_t **);
    165165/** @memberof bithenge_transform_t */
    166 int bithenge_transform_prefix_length(bithenge_transform_t *,
     166errno_t bithenge_transform_prefix_length(bithenge_transform_t *,
    167167    bithenge_scope_t *, bithenge_blob_t *, aoff64_t *);
    168168/** @memberof bithenge_transform_t */
    169 int bithenge_transform_prefix_apply(bithenge_transform_t *, bithenge_scope_t *,
     169errno_t bithenge_transform_prefix_apply(bithenge_transform_t *, bithenge_scope_t *,
    170170    bithenge_blob_t *, bithenge_node_t **, aoff64_t *);
    171 int bithenge_new_barrier_transform(bithenge_transform_t **, int);
    172 int bithenge_barrier_transform_set_subtransform(bithenge_transform_t *,
     171errno_t bithenge_new_barrier_transform(bithenge_transform_t **, int);
     172errno_t bithenge_barrier_transform_set_subtransform(bithenge_transform_t *,
    173173    bithenge_transform_t *);
    174174
    175175/** @memberof bithenge_scope_t */
    176 int bithenge_scope_new(bithenge_scope_t **, bithenge_scope_t *);
     176errno_t bithenge_scope_new(bithenge_scope_t **, bithenge_scope_t *);
    177177/** @memberof bithenge_scope_t */
    178178void bithenge_scope_dec_ref(bithenge_scope_t *);
    … …  
    182182const char *bithenge_scope_get_error(bithenge_scope_t *);
    183183/** @memberof bithenge_scope_t */
    184 int bithenge_scope_error(bithenge_scope_t *, const char *, ...);
     184errno_t bithenge_scope_error(bithenge_scope_t *, const char *, ...);
    185185/** @memberof bithenge_scope_t */
    186186bithenge_node_t *bithenge_scope_get_current_node(bithenge_scope_t *);
    … …  
    196196bool bithenge_scope_is_barrier(bithenge_scope_t *);
    197197/** @memberof bithenge_scope_t */
    198 int bithenge_scope_alloc_params(bithenge_scope_t *, int);
    199 /** @memberof bithenge_scope_t */
    200 int bithenge_scope_set_param(bithenge_scope_t *, int, bithenge_node_t *);
    201 /** @memberof bithenge_scope_t */
    202 int bithenge_scope_get_param(bithenge_scope_t *, int, bithenge_node_t **);
     198errno_t bithenge_scope_alloc_params(bithenge_scope_t *, int);
     199/** @memberof bithenge_scope_t */
     200errno_t bithenge_scope_set_param(bithenge_scope_t *, int, bithenge_node_t *);
     201/** @memberof bithenge_scope_t */
     202errno_t bithenge_scope_get_param(bithenge_scope_t *, int, bithenge_node_t **);
    203203
    204204#endif

  • uspace/lib/bithenge/include/bithenge/tree.h

    r36f0738 rb7fd2a0  
    8181 * @param data Data provided to @a bithenge_node_t::bithenge_node_for_each.
    8282 * @return EOK on success or an error code from errno.h. */
    83 typedef int (*bithenge_for_each_func_t)(bithenge_node_t *key, bithenge_node_t *value, void *data);
     83typedef errno_t (*bithenge_for_each_func_t)(bithenge_node_t *key, bithenge_node_t *value, void *data);
    8484
    8585/** Operations providing access to an internal node. */
    8686typedef struct bithenge_internal_node_ops_t {
    8787        /** @copydoc bithenge_node_t::bithenge_node_for_each */
    88         int (*for_each)(bithenge_node_t *self, bithenge_for_each_func_t func, void *data);
     88        errno_t (*for_each)(bithenge_node_t *self, bithenge_for_each_func_t func, void *data);
    8989        /** @copydoc bithenge_node_t::bithenge_node_get */
    90         int (*get)(bithenge_node_t *self, bithenge_node_t *key,
     90        errno_t (*get)(bithenge_node_t *self, bithenge_node_t *key,
    9191            bithenge_node_t **out);
    9292        /** Destroys the internal node.
    … …  
    122122 * @param data Data to provide to the callback function.
    123123 * @return EOK on success or an error code from errno.h. */
    124 static inline int bithenge_node_for_each(bithenge_node_t *self,
     124static inline errno_t bithenge_node_for_each(bithenge_node_t *self,
    125125    bithenge_for_each_func_t func, void *data)
    126126{
    … …  
    130130
    131131/** @memberof bithenge_node_t */
    132 int bithenge_node_get(bithenge_node_t *, bithenge_node_t *,
     132errno_t bithenge_node_get(bithenge_node_t *, bithenge_node_t *,
    133133    bithenge_node_t **);
    134134
    … …  
    164164
    165165/** @memberof bithenge_node_t */
    166 int bithenge_init_internal_node(bithenge_node_t *,
     166errno_t bithenge_init_internal_node(bithenge_node_t *,
    167167    const bithenge_internal_node_ops_t *);
    168168/** @memberof bithenge_node_t */
    169 int bithenge_new_empty_internal_node(bithenge_node_t **);
     169errno_t bithenge_new_empty_internal_node(bithenge_node_t **);
    170170/** @memberof bithenge_node_t */
    171 int bithenge_new_simple_internal_node(bithenge_node_t **, bithenge_node_t **,
     171errno_t bithenge_new_simple_internal_node(bithenge_node_t **, bithenge_node_t **,
    172172    bithenge_int_t, bool needs_free);
    173173/** @memberof bithenge_node_t */
    174 int bithenge_new_boolean_node(bithenge_node_t **, bool);
     174errno_t bithenge_new_boolean_node(bithenge_node_t **, bool);
    175175/** @memberof bithenge_node_t */
    176 int bithenge_new_integer_node(bithenge_node_t **, bithenge_int_t);
     176errno_t bithenge_new_integer_node(bithenge_node_t **, bithenge_int_t);
    177177/** @memberof bithenge_node_t */
    178 int bithenge_new_string_node(bithenge_node_t **, const char *, bool);
     178errno_t bithenge_new_string_node(bithenge_node_t **, const char *, bool);
    179179/** @memberof bithenge_node_t */
    180 int bithenge_node_equal(bool *, bithenge_node_t *, bithenge_node_t *);
     180errno_t bithenge_node_equal(bool *, bithenge_node_t *, bithenge_node_t *);
    181181
    182182#endif
Note: See TracChangeset for help on using the changeset viewer.