Changeset 2304 for libcaca/trunk/cucul/import.c

Timestamp:

04/19/08 21:25:47 (5 years ago)

Author:

sam

Message:

• Get rid of the last long types in the API.
• Use size_t and ssize_t where appropriate.

File:

• libcaca/trunk/cucul/import.c (modified) (8 diffs)

libcaca/trunk/cucul/import.c

@@ -53 +53 @@
 };
 
-static long int import_caca(cucul_canvas_t *, void const *, unsigned int);
-static long int import_text(cucul_canvas_t *, void const *, unsigned int);
-static long int import_ansi(cucul_canvas_t *, void const *, unsigned int, int);
+static ssize_t import_caca(cucul_canvas_t *, void const *, size_t);
+static ssize_t import_text(cucul_canvas_t *, void const *, size_t);
+static ssize_t import_ansi(cucul_canvas_t *, void const *, size_t, int);
 
 static void ansi_parse_grcm(cucul_canvas_t *, struct import *,
@@ -87 +87 @@
  *  or -1 if an error occurred.
  */
-long int cucul_import_memory(cucul_canvas_t *cv, void const *data,
-                             unsigned long int len, char const *format)
+ssize_t cucul_import_memory(cucul_canvas_t *cv, void const *data,
+                            size_t len, char const *format)
 {
     if(!strcasecmp("caca", format))
@@ -152 +152 @@
  *  or -1 if an error occurred.
  */
-long int cucul_import_file(cucul_canvas_t *cv, char const *filename,
-                           char const *format)
+ssize_t cucul_import_file(cucul_canvas_t *cv, char const *filename,
+                          char const *format)
 {
 #if defined __KERNEL__
@@ -161 +161 @@
     FILE *fp;
     void *data;
-    long int size;
+    ssize_t size;
     int ret;
 
@@ -220 +220 @@
  */
 
-static long int import_caca(cucul_canvas_t *cv,
-                            void const *data, unsigned int size)
+static ssize_t import_caca(cucul_canvas_t *cv, void const *data, size_t size)
 {
     uint8_t const *buf = (uint8_t const *)data;
@@ -338 +337 @@
 }
 
-static long int import_text(cucul_canvas_t *cv,
-                            void const *data, unsigned int size)
+static ssize_t import_text(cucul_canvas_t *cv, void const *data, size_t size)
 {
     char const *text = (char const *)data;
@@ -381 +379 @@
 }
 
-static long int import_ansi(cucul_canvas_t *cv,
-                            void const *data, unsigned int size, int utf8)
+static ssize_t import_ansi(cucul_canvas_t *cv, void const *data,
+                           size_t size, int utf8)
 {
     struct import im;
@@ -683 +681 @@
         else if(utf8)
         {
-            unsigned int bytes;
+            size_t bytes;
 
             if(i + 6 < size)