Changeset 2406 for libcaca/trunk/cucul/figfont.cTweet

Timestamp:

Jun 15, 2008, 3:50:02 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Export cucul_file_t operations in the public header.
• Implement cucul_file_read() and cucul_file_write().

File:

• libcaca/trunk/cucul/figfont.c (modified) (11 diffs)

libcaca/trunk/cucul/figfont.c

@@ -302 +302 @@
 
     /* Open font: if not found, try .tlf, then .flf */
-    f = _cucul_file_open(path, "r");
+    f = cucul_file_open(path, "r");
 #if !defined __KERNEL__ && defined HAVE_SNPRINTF
 
@@ -313 +313 @@
         snprintf(altpath, 2047, "%s.tlf", path);
         altpath[2047] = '\0';
-        f = _cucul_file_open(altpath, "r");
+        f = cucul_file_open(altpath, "r");
     }
     if(!f)
@@ -319 +319 @@
         snprintf(altpath, 2047, "%s.flf", path);
         altpath[2047] = '\0';
-        f = _cucul_file_open(altpath, "r");
+        f = cucul_file_open(altpath, "r");
     }
 #endif
@@ -333 +333 @@
     ff->full_layout = 0;
     ff->codetag_count = 0;
-    _cucul_file_gets(buf, 2048, f);
+    cucul_file_gets(f, buf, 2048);
     if(sscanf(buf, "%*[ft]lf2a%6s %u %u %u %i %u %u %u %u\n", hardblank,
               &ff->height, &ff->baseline, &ff->max_length,
@@ -340 +340 @@
     {
         debug("figfont error: `%s' has invalid header: %s", path, buf);
-        _cucul_file_close(f);
+        cucul_file_close(f);
         free(ff);
         seterrno(EINVAL);
@@ -352 +352 @@
         debug("figfont error: `%s' has invalid layout %i/%u",
                 path, ff->old_layout, ff->full_layout);
-        _cucul_file_close(f);
+        cucul_file_close(f);
         free(ff);
         seterrno(EINVAL);
@@ -362 +362 @@
     /* Skip comment lines */
     for(i = 0; i < comment_lines; i++)
-        _cucul_file_gets(buf, 2048, f);
+        cucul_file_gets(f, buf, 2048);
 
     /* Read mandatory characters (32-127, 196, 214, 220, 228, 246, 252, 223)
@@ -369 +369 @@
     ff->lookup = NULL;
 
-    for(i = 0, size = 0; !_cucul_file_eof(f); ff->glyphs++)
+    for(i = 0, size = 0; !cucul_file_eof(f); ff->glyphs++)
     {
         if((ff->glyphs % 2048) == 0)
@@ -386 +386 @@
         else
         {
-            if(_cucul_file_gets(buf, 2048, f) == NULL)
+            if(cucul_file_gets(f, buf, 2048) == NULL)
                 break;
 
@@ -397 +397 @@
             {
                 for(j = 0; j < ff->height; j++)
-                    _cucul_file_gets(buf, 2048, f);
+                    cucul_file_gets(f, buf, 2048);
                 continue;
             }
@@ -424 +424 @@
                 data = realloc(data, size += 2048);
 
-            _cucul_file_gets(data + i, 2048, f);
+            cucul_file_gets(f, data + i, 2048);
             i = (uintptr_t)strchr(data + i, 0) - (uintptr_t)data;
         }
     }
 
-    _cucul_file_close(f);
+    cucul_file_close(f);
 
     if(ff->glyphs < EXT_GLYPHS)