Changes in uspace/lib/draw/font/pcf.c [b7fd2a0:d5c1051] in mainline

File:

• uspace/lib/draw/font/pcf.c (modified) (13 diffs)

uspace/lib/draw/font/pcf.c

@@ -146 +146 @@
 }
 
-static errno_t pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
+static int pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
     glyph_id_t *glyph_id)
 {
@@ -183 +183 @@
 }
 
-static errno_t load_glyph_metrics(pcf_data_t *data, uint32_t glyph_id,
+static int load_glyph_metrics(pcf_data_t *data, uint32_t glyph_id,
     pcf_toc_entry_t *table, pcf_default_metrics_t *metrics)
 {
@@ -253 +253 @@
 }
 
-static errno_t pcf_load_glyph_surface(void *opaque_data, glyph_id_t glyph_id,
+static int pcf_load_glyph_surface(void *opaque_data, glyph_id_t glyph_id,
     surface_t **out_surface)
 {
@@ -260 +260 @@
         pcf_default_metrics_t pcf_metrics;
         memset(&pcf_metrics, 0, sizeof(pcf_default_metrics_t));
-        errno_t rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
+        int rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
             &pcf_metrics);
         if (rc != EOK)
@@ -339 +339 @@
 }
 
-static errno_t pcf_load_glyph_metrics(void *opaque_data, glyph_id_t glyph_id,
+static int pcf_load_glyph_metrics(void *opaque_data, glyph_id_t glyph_id,
     glyph_metrics_t *gm)
 {
@@ -346 +346 @@
         pcf_default_metrics_t pcf_metrics;
         memset(&pcf_metrics, 0, sizeof(pcf_default_metrics_t));
-        errno_t rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
+        int rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
             &pcf_metrics);
         if (rc != EOK)
@@ -377 +377 @@
 };
 
-static errno_t pcf_read_toc(pcf_data_t *data)
+static int pcf_read_toc(pcf_data_t *data)
 {
         int rc = fseek(data->file, 0, SEEK_END);
@@ -460 +460 @@
 }
 
-static errno_t pcf_seek_table_header(pcf_data_t *data, pcf_toc_entry_t *table)
+static int pcf_seek_table_header(pcf_data_t *data, pcf_toc_entry_t *table)
 {
         uint32_t format;
@@ -478 +478 @@
 }
 
-static errno_t pcf_read_bitmap_table_header(pcf_data_t *data)
-{
-        errno_t rc = pcf_seek_table_header(data, &data->bitmap_table);
+static int pcf_read_bitmap_table_header(pcf_data_t *data)
+{
+        int rc = pcf_seek_table_header(data, &data->bitmap_table);
         if (rc != EOK)
                 return rc;
@@ -498 +498 @@
 }
 
-static errno_t pcf_read_metrics_table_header(pcf_data_t *data)
-{
-        errno_t rc = pcf_seek_table_header(data, &data->metrics_table);
+static int pcf_read_metrics_table_header(pcf_data_t *data)
+{
+        int rc = pcf_seek_table_header(data, &data->metrics_table);
         if (rc != EOK)
                 return rc;
@@ -531 +531 @@
 }
 
-static errno_t pcf_read_encodings_table_header(pcf_data_t *data)
-{
-        errno_t rc = pcf_seek_table_header(data, &data->encodings_table);
+static int pcf_read_encodings_table_header(pcf_data_t *data)
+{
+        int rc = pcf_seek_table_header(data, &data->encodings_table);
         if (rc != EOK)
                 return rc;
@@ -558 +558 @@
 }
 
-static errno_t pcf_read_accelerators_table(pcf_data_t *data)
-{
-        errno_t rc = pcf_seek_table_header(data, &data->accelerators_table);
+static int pcf_read_accelerators_table(pcf_data_t *data)
+{
+        int rc = pcf_seek_table_header(data, &data->accelerators_table);
         if (rc != EOK)
                 return rc;
@@ -579 +579 @@
 }
 
-errno_t pcf_font_create(font_t **font, char *filename, uint16_t points)
-{
-        errno_t rc;
+int pcf_font_create(font_t **font, char *filename, uint16_t points)
+{
+        int rc;
         pcf_data_t *data = malloc(sizeof(pcf_data_t));
         if (data == NULL)