Changeset b7fd2a0 in mainline for uspace/lib/draw/font/bitmap_backend.c

Timestamp:

2018-01-13T03:10:29Z (7 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
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

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.

File:

• uspace/lib/draw/font/bitmap_backend.c (modified) (9 diffs)

uspace/lib/draw/font/bitmap_backend.c

@@ -59 +59 @@
 } bitmap_backend_data_t;
 
-static int bb_get_font_metrics(void *backend_data, font_metrics_t *font_metrics)
+static errno_t bb_get_font_metrics(void *backend_data, font_metrics_t *font_metrics)
 {
         bitmap_backend_data_t *data = (bitmap_backend_data_t *) backend_data;
@@ -68 +68 @@
 }
 
-static int bb_resolve_glyph(void *backend_data, wchar_t c, glyph_id_t *glyph_id)
+static errno_t bb_resolve_glyph(void *backend_data, wchar_t c, glyph_id_t *glyph_id)
 {
         bitmap_backend_data_t *data = (bitmap_backend_data_t *) backend_data;
@@ -74 +74 @@
 }
 
-static int bb_get_glyph_metrics(void *backend_data, glyph_id_t glyph_id,
+static errno_t bb_get_glyph_metrics(void *backend_data, glyph_id_t glyph_id,
     glyph_metrics_t *glyph_metrics)
 {
@@ -89 +89 @@
         glyph_metrics_t gm;
         
-        int rc = data->decoder->load_glyph_metrics(data->decoder_data, glyph_id,
+        errno_t rc = data->decoder->load_glyph_metrics(data->decoder_data, glyph_id,
             &gm);
         if (rc != EOK)
@@ -115 +115 @@
 }
 
-static int get_glyph_surface(bitmap_backend_data_t *data, glyph_id_t glyph_id,
+static errno_t get_glyph_surface(bitmap_backend_data_t *data, glyph_id_t glyph_id,
     surface_t **result)
 {
@@ -127 +127 @@
         
         surface_t *raw_surface;
-        int rc = data->decoder->load_glyph_surface(data->decoder_data, glyph_id,
+        errno_t rc = data->decoder->load_glyph_surface(data->decoder_data, glyph_id,
             &raw_surface);
         if (rc != EOK)
@@ -173 +173 @@
 }
 
-static int bb_render_glyph(void *backend_data, drawctx_t *context,
+static errno_t bb_render_glyph(void *backend_data, drawctx_t *context,
     source_t *source, sysarg_t ox, sysarg_t oy, glyph_id_t glyph_id)
 {
@@ -179 +179 @@
         
         glyph_metrics_t glyph_metrics;
-        int rc = bb_get_glyph_metrics(backend_data, glyph_id, &glyph_metrics);
+        errno_t rc = bb_get_glyph_metrics(backend_data, glyph_id, &glyph_metrics);
         if (rc != EOK)
                 return rc;
@@ -224 +224 @@
 };
 
-int bitmap_font_create(bitmap_font_decoder_t *decoder, void *decoder_data,
+errno_t bitmap_font_create(bitmap_font_decoder_t *decoder, void *decoder_data,
     uint32_t glyph_count, font_metrics_t font_metrics, uint16_t points,
     font_t **out_font)