Changeset b7fd2a0 in mainline for uspace/lib/draw


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/draw
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/draw/codec/tga.gz.c

    r36f0738 rb7fd2a0  
    5959        size_t size_expanded;
    6060       
    61         int ret = gzip_expand(data, size, &data_expanded, &size_expanded);
     61        errno_t ret = gzip_expand(data, size, &data_expanded, &size_expanded);
    6262        if (ret != EOK)
    6363                return NULL;

  • uspace/lib/draw/font.c

    r36f0738 rb7fd2a0  
    6060}
    6161
    62 int font_get_metrics(font_t *font, font_metrics_t *metrics) {
     62errno_t font_get_metrics(font_t *font, font_metrics_t *metrics) {
    6363        return font->backend->get_font_metrics(font->backend_data, metrics);
    6464}
    6565
    66 int font_resolve_glyph(font_t *font, wchar_t c, glyph_id_t *glyph_id) {
     66errno_t font_resolve_glyph(font_t *font, wchar_t c, glyph_id_t *glyph_id) {
    6767        return font->backend->resolve_glyph(font->backend_data, c, glyph_id);
    6868}
    6969
    70 int font_get_glyph_metrics(font_t *font, glyph_id_t glyph_id,
     70errno_t font_get_glyph_metrics(font_t *font, glyph_id_t glyph_id,
    7171    glyph_metrics_t *glyph_metrics)
    7272{
    … …  
    7575}
    7676
    77 int font_render_glyph(font_t *font, drawctx_t *context, source_t *source,
     77errno_t font_render_glyph(font_t *font, drawctx_t *context, source_t *source,
    7878    sysarg_t x, sysarg_t y, glyph_id_t glyph_id)
    7979{
    … …  
    8383
    8484/* TODO this is bad interface */
    85 int font_get_box(font_t *font, char *text, sysarg_t *width, sysarg_t *height)
     85errno_t font_get_box(font_t *font, char *text, sysarg_t *width, sysarg_t *height)
    8686{
    8787        font_metrics_t fm;
    88         int rc = font_get_metrics(font, &fm);
     88        errno_t rc = font_get_metrics(font, &fm);
    8989        if (rc != EOK)
    9090                return rc;
    … …  
    101101                rc = font_resolve_glyph(font, c, &glyph_id);
    102102                if (rc != EOK) {
    103                         int rc2 = font_resolve_glyph(font, U_SPECIAL, &glyph_id);
     103                        errno_t rc2 = font_resolve_glyph(font, U_SPECIAL, &glyph_id);
    104104                        if (rc2 != EOK) {
    105105                                return rc;
    … …  
    121121
    122122/* TODO this is bad interface */
    123 int font_draw_text(font_t *font, drawctx_t *context, source_t *source,
     123errno_t font_draw_text(font_t *font, drawctx_t *context, source_t *source,
    124124    const char *text, sysarg_t sx, sysarg_t sy)
    125125{
    … …  
    128128
    129129        font_metrics_t fm;
    130         int rc = font_get_metrics(font, &fm);
     130        errno_t rc = font_get_metrics(font, &fm);
    131131        if (rc != EOK)
    132132                return rc;
    … …  
    144144                rc = font_resolve_glyph(font, c, &glyph_id);
    145145                if (rc != EOK) {
    146                         int rc2 = font_resolve_glyph(font, U_SPECIAL, &glyph_id);
     146                        errno_t rc2 = font_resolve_glyph(font, U_SPECIAL, &glyph_id);
    147147                        if (rc2 != EOK) {
    148148                                return rc;

  • uspace/lib/draw/font.h

    r36f0738 rb7fd2a0  
    9191
    9292typedef struct {
    93         int (*get_font_metrics)(void *, font_metrics_t *);
    94         int (*resolve_glyph)(void *, wchar_t, glyph_id_t *);
    95         int (*get_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
    96         int (*render_glyph)(void *, drawctx_t *, source_t *, sysarg_t,
     93        errno_t (*get_font_metrics)(void *, font_metrics_t *);
     94        errno_t (*resolve_glyph)(void *, wchar_t, glyph_id_t *);
     95        errno_t (*get_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
     96        errno_t (*render_glyph)(void *, drawctx_t *, source_t *, sysarg_t,
    9797            sysarg_t, glyph_id_t);
    9898        void (*release)(void *);
    … …  
    105105
    106106extern font_t *font_create(font_backend_t *, void *);
    107 extern int font_get_metrics(font_t *, font_metrics_t *);
    108 extern int font_resolve_glyph(font_t *, wchar_t, glyph_id_t *);
    109 extern int font_get_glyph_metrics(font_t *, glyph_id_t, glyph_metrics_t *);
    110 extern int font_render_glyph(font_t *, drawctx_t *, source_t *,
     107extern errno_t font_get_metrics(font_t *, font_metrics_t *);
     108extern errno_t font_resolve_glyph(font_t *, wchar_t, glyph_id_t *);
     109extern errno_t font_get_glyph_metrics(font_t *, glyph_id_t, glyph_metrics_t *);
     110extern errno_t font_render_glyph(font_t *, drawctx_t *, source_t *,
    111111    sysarg_t, sysarg_t, glyph_id_t);
    112112extern void font_release(font_t *);
    113113
    114 extern int font_get_box(font_t *, char *, sysarg_t *, sysarg_t *);
    115 extern int font_draw_text(font_t *, drawctx_t *, source_t *, const char *,
     114extern errno_t font_get_box(font_t *, char *, sysarg_t *, sysarg_t *);
     115extern errno_t font_draw_text(font_t *, drawctx_t *, source_t *, const char *,
    116116    sysarg_t, sysarg_t);
    117117

  • uspace/lib/draw/font/bitmap_backend.c

    r36f0738 rb7fd2a0  
    5959} bitmap_backend_data_t;
    6060
    61 static int bb_get_font_metrics(void *backend_data, font_metrics_t *font_metrics)
     61static errno_t bb_get_font_metrics(void *backend_data, font_metrics_t *font_metrics)
    6262{
    6363        bitmap_backend_data_t *data = (bitmap_backend_data_t *) backend_data;
    … …  
    6868}
    6969
    70 static int bb_resolve_glyph(void *backend_data, wchar_t c, glyph_id_t *glyph_id)
     70static errno_t bb_resolve_glyph(void *backend_data, wchar_t c, glyph_id_t *glyph_id)
    7171{
    7272        bitmap_backend_data_t *data = (bitmap_backend_data_t *) backend_data;
    … …  
    7474}
    7575
    76 static int bb_get_glyph_metrics(void *backend_data, glyph_id_t glyph_id,
     76static errno_t bb_get_glyph_metrics(void *backend_data, glyph_id_t glyph_id,
    7777    glyph_metrics_t *glyph_metrics)
    7878{
    … …  
    8989        glyph_metrics_t gm;
    9090       
    91         int rc = data->decoder->load_glyph_metrics(data->decoder_data, glyph_id,
     91        errno_t rc = data->decoder->load_glyph_metrics(data->decoder_data, glyph_id,
    9292            &gm);
    9393        if (rc != EOK)
    … …  
    115115}
    116116
    117 static int get_glyph_surface(bitmap_backend_data_t *data, glyph_id_t glyph_id,
     117static errno_t get_glyph_surface(bitmap_backend_data_t *data, glyph_id_t glyph_id,
    118118    surface_t **result)
    119119{
    … …  
    127127       
    128128        surface_t *raw_surface;
    129         int rc = data->decoder->load_glyph_surface(data->decoder_data, glyph_id,
     129        errno_t rc = data->decoder->load_glyph_surface(data->decoder_data, glyph_id,
    130130            &raw_surface);
    131131        if (rc != EOK)
    … …  
    173173}
    174174
    175 static int bb_render_glyph(void *backend_data, drawctx_t *context,
     175static errno_t bb_render_glyph(void *backend_data, drawctx_t *context,
    176176    source_t *source, sysarg_t ox, sysarg_t oy, glyph_id_t glyph_id)
    177177{
    … …  
    179179       
    180180        glyph_metrics_t glyph_metrics;
    181         int rc = bb_get_glyph_metrics(backend_data, glyph_id, &glyph_metrics);
     181        errno_t rc = bb_get_glyph_metrics(backend_data, glyph_id, &glyph_metrics);
    182182        if (rc != EOK)
    183183                return rc;
    … …  
    224224};
    225225
    226 int bitmap_font_create(bitmap_font_decoder_t *decoder, void *decoder_data,
     226errno_t bitmap_font_create(bitmap_font_decoder_t *decoder, void *decoder_data,
    227227    uint32_t glyph_count, font_metrics_t font_metrics, uint16_t points,
    228228    font_t **out_font)

  • uspace/lib/draw/font/bitmap_backend.h

    r36f0738 rb7fd2a0  
    4545
    4646typedef struct {
    47         int (*resolve_glyph)(void *, const wchar_t, glyph_id_t *);
    48         int (*load_glyph_surface)(void *, glyph_id_t, surface_t **);
    49         int (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
     47        errno_t (*resolve_glyph)(void *, const wchar_t, glyph_id_t *);
     48        errno_t (*load_glyph_surface)(void *, glyph_id_t, surface_t **);
     49        errno_t (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
    5050        void (*release)(void *);
    5151} bitmap_font_decoder_t;
    5252
    53 extern int bitmap_font_create(bitmap_font_decoder_t *, void *, uint32_t,
     53extern errno_t bitmap_font_create(bitmap_font_decoder_t *, void *, uint32_t,
    5454    font_metrics_t, uint16_t, font_t **);
    5555

  • uspace/lib/draw/font/embedded.c

    r36f0738 rb7fd2a0  
    4444#include "bitmap_backend.h"
    4545
    46 static int fde_resolve_glyph(void *unused, const wchar_t chr,
     46static errno_t fde_resolve_glyph(void *unused, const wchar_t chr,
    4747    glyph_id_t *glyph_id)
    4848{
    … …  
    5656}
    5757
    58 static int fde_load_glyph_surface(void *unused, glyph_id_t glyph_id,
     58static errno_t fde_load_glyph_surface(void *unused, glyph_id_t glyph_id,
    5959    surface_t **out_surface)
    6060{
    … …  
    7575}
    7676
    77 static int fde_load_glyph_metrics(void *unused, glyph_id_t glyph_id,
     77static errno_t fde_load_glyph_metrics(void *unused, glyph_id_t glyph_id,
    7878    glyph_metrics_t *gm)
    7979{
    … …  
    106106};
    107107
    108 int embedded_font_create(font_t **font, uint16_t points)
     108errno_t embedded_font_create(font_t **font, uint16_t points)
    109109{
    110110        return bitmap_font_create(&fd_embedded, NULL, FONT_GLYPHS, font_metrics,

  • uspace/lib/draw/font/embedded.h

    r36f0738 rb7fd2a0  
    3939#include "../font.h"
    4040
    41 extern int embedded_font_create(font_t **, uint16_t points);
     41extern errno_t embedded_font_create(font_t **, uint16_t points);
    4242
    4343#endif

  • uspace/lib/draw/font/pcf.c

    r36f0738 rb7fd2a0  
    146146}
    147147
    148 static int pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
     148static errno_t pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
    149149    glyph_id_t *glyph_id)
    150150{
    … …  
    183183}
    184184
    185 static int load_glyph_metrics(pcf_data_t *data, uint32_t glyph_id,
     185static errno_t load_glyph_metrics(pcf_data_t *data, uint32_t glyph_id,
    186186    pcf_toc_entry_t *table, pcf_default_metrics_t *metrics)
    187187{
    … …  
    253253}
    254254
    255 static int pcf_load_glyph_surface(void *opaque_data, glyph_id_t glyph_id,
     255static errno_t pcf_load_glyph_surface(void *opaque_data, glyph_id_t glyph_id,
    256256    surface_t **out_surface)
    257257{
    … …  
    260260        pcf_default_metrics_t pcf_metrics;
    261261        memset(&pcf_metrics, 0, sizeof(pcf_default_metrics_t));
    262         int rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
     262        errno_t rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
    263263            &pcf_metrics);
    264264        if (rc != EOK)
    … …  
    339339}
    340340
    341 static int pcf_load_glyph_metrics(void *opaque_data, glyph_id_t glyph_id,
     341static errno_t pcf_load_glyph_metrics(void *opaque_data, glyph_id_t glyph_id,
    342342    glyph_metrics_t *gm)
    343343{
    … …  
    346346        pcf_default_metrics_t pcf_metrics;
    347347        memset(&pcf_metrics, 0, sizeof(pcf_default_metrics_t));
    348         int rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
     348        errno_t rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
    349349            &pcf_metrics);
    350350        if (rc != EOK)
    … …  
    377377};
    378378
    379 static int pcf_read_toc(pcf_data_t *data)
     379static errno_t pcf_read_toc(pcf_data_t *data)
    380380{
    381381        int rc = fseek(data->file, 0, SEEK_END);
    … …  
    460460}
    461461
    462 static int pcf_seek_table_header(pcf_data_t *data, pcf_toc_entry_t *table)
     462static errno_t pcf_seek_table_header(pcf_data_t *data, pcf_toc_entry_t *table)
    463463{
    464464        uint32_t format;
    … …  
    478478}
    479479
    480 static int pcf_read_bitmap_table_header(pcf_data_t *data)
    481 {
    482         int rc = pcf_seek_table_header(data, &data->bitmap_table);
     480static errno_t pcf_read_bitmap_table_header(pcf_data_t *data)
     481{
     482        errno_t rc = pcf_seek_table_header(data, &data->bitmap_table);
    483483        if (rc != EOK)
    484484                return rc;
    … …  
    498498}
    499499
    500 static int pcf_read_metrics_table_header(pcf_data_t *data)
    501 {
    502         int rc = pcf_seek_table_header(data, &data->metrics_table);
     500static errno_t pcf_read_metrics_table_header(pcf_data_t *data)
     501{
     502        errno_t rc = pcf_seek_table_header(data, &data->metrics_table);
    503503        if (rc != EOK)
    504504                return rc;
    … …  
    531531}
    532532
    533 static int pcf_read_encodings_table_header(pcf_data_t *data)
    534 {
    535         int rc = pcf_seek_table_header(data, &data->encodings_table);
     533static errno_t pcf_read_encodings_table_header(pcf_data_t *data)
     534{
     535        errno_t rc = pcf_seek_table_header(data, &data->encodings_table);
    536536        if (rc != EOK)
    537537                return rc;
    … …  
    558558}
    559559
    560 static int pcf_read_accelerators_table(pcf_data_t *data)
    561 {
    562         int rc = pcf_seek_table_header(data, &data->accelerators_table);
     560static errno_t pcf_read_accelerators_table(pcf_data_t *data)
     561{
     562        errno_t rc = pcf_seek_table_header(data, &data->accelerators_table);
    563563        if (rc != EOK)
    564564                return rc;
    … …  
    579579}
    580580
    581 int pcf_font_create(font_t **font, char *filename, uint16_t points)
    582 {
    583         int rc;
     581errno_t pcf_font_create(font_t **font, char *filename, uint16_t points)
     582{
     583        errno_t rc;
    584584        pcf_data_t *data = malloc(sizeof(pcf_data_t));
    585585        if (data == NULL)

  • uspace/lib/draw/font/pcf.h

    r36f0738 rb7fd2a0  
    3939#include "../font.h"
    4040
    41 extern int pcf_font_create(font_t **, char *path, uint16_t points);
     41extern errno_t pcf_font_create(font_t **, char *path, uint16_t points);
    4242
    4343#endif
Note: See TracChangeset for help on using the changeset viewer.