Changes in uspace/lib/draw/font/pcf.c [38d150e:1d6dd2a] in mainline

File:

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

uspace/lib/draw/font/pcf.c

@@ -42 +42 @@
 #include <offset.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include "pcf.h"
@@ -146 +147 @@
 }
 
-static int pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
+static errno_t pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
     glyph_id_t *glyph_id)
 {
@@ -183 +184 @@
 }
 
-static int load_glyph_metrics(pcf_data_t *data, uint32_t glyph_id,
+static errno_t load_glyph_metrics(pcf_data_t *data, uint32_t glyph_id,
     pcf_toc_entry_t *table, pcf_default_metrics_t *metrics)
 {
@@ -253 +254 @@
 }
 
-static int pcf_load_glyph_surface(void *opaque_data, glyph_id_t glyph_id,
+static errno_t pcf_load_glyph_surface(void *opaque_data, glyph_id_t glyph_id,
     surface_t **out_surface)
 {
@@ -260 +261 @@
         pcf_default_metrics_t pcf_metrics;
         memset(&pcf_metrics, 0, sizeof(pcf_default_metrics_t));
-        int rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
+        errno_t rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
             &pcf_metrics);
         if (rc != EOK)
@@ -268 +269 @@
             (glyph_id * sizeof(uint32_t));
         
-        rc = fseek(data->file, offset, SEEK_SET);
-        if (rc != 0)
+        if (fseek(data->file, offset, SEEK_SET) < 0)
                 return errno;
         
@@ -284 +284 @@
             + bitmap_offset;
         
-        rc = fseek(data->file, offset, SEEK_SET);
-        if (rc != 0)
+        if (fseek(data->file, offset, SEEK_SET) < 0)
                 return errno;
         
@@ -341 +340 @@
 }
 
-static int pcf_load_glyph_metrics(void *opaque_data, glyph_id_t glyph_id,
+static errno_t pcf_load_glyph_metrics(void *opaque_data, glyph_id_t glyph_id,
     glyph_metrics_t *gm)
 {
@@ -348 +347 @@
         pcf_default_metrics_t pcf_metrics;
         memset(&pcf_metrics, 0, sizeof(pcf_default_metrics_t));
-        int rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
+        errno_t rc = load_glyph_metrics(data, glyph_id, &data->metrics_table,
             &pcf_metrics);
         if (rc != EOK)
@@ -379 +378 @@
 };
 
-static int pcf_read_toc(pcf_data_t *data)
+static errno_t pcf_read_toc(pcf_data_t *data)
 {
         int rc = fseek(data->file, 0, SEEK_END);
@@ -462 +461 @@
 }
 
-static int pcf_seek_table_header(pcf_data_t *data, pcf_toc_entry_t *table)
+static errno_t pcf_seek_table_header(pcf_data_t *data, pcf_toc_entry_t *table)
 {
         uint32_t format;
@@ -480 +479 @@
 }
 
-static int pcf_read_bitmap_table_header(pcf_data_t *data)
-{
-        int rc = pcf_seek_table_header(data, &data->bitmap_table);
+static errno_t pcf_read_bitmap_table_header(pcf_data_t *data)
+{
+        errno_t rc = pcf_seek_table_header(data, &data->bitmap_table);
         if (rc != EOK)
                 return rc;
@@ -500 +499 @@
 }
 
-static int pcf_read_metrics_table_header(pcf_data_t *data)
-{
-        int rc = pcf_seek_table_header(data, &data->metrics_table);
+static errno_t pcf_read_metrics_table_header(pcf_data_t *data)
+{
+        errno_t rc = pcf_seek_table_header(data, &data->metrics_table);
         if (rc != EOK)
                 return rc;
@@ -533 +532 @@
 }
 
-static int pcf_read_encodings_table_header(pcf_data_t *data)
-{
-        int rc = pcf_seek_table_header(data, &data->encodings_table);
+static errno_t pcf_read_encodings_table_header(pcf_data_t *data)
+{
+        errno_t rc = pcf_seek_table_header(data, &data->encodings_table);
         if (rc != EOK)
                 return rc;
@@ -560 +559 @@
 }
 
-static int pcf_read_accelerators_table(pcf_data_t *data)
-{
-        int rc = pcf_seek_table_header(data, &data->accelerators_table);
+static errno_t pcf_read_accelerators_table(pcf_data_t *data)
+{
+        errno_t rc = pcf_seek_table_header(data, &data->accelerators_table);
         if (rc != EOK)
                 return rc;
@@ -581 +580 @@
 }
 
-int pcf_font_create(font_t **font, char *filename, uint16_t points)
-{
-        int rc;
+errno_t pcf_font_create(font_t **font, char *filename, uint16_t points)
+{
+        errno_t rc;
         pcf_data_t *data = malloc(sizeof(pcf_data_t));
         if (data == NULL)