Changeset 2410 for libcacaTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

• Make deprecated cucul_load_file() use cucul_file_t functions.

File:

• libcaca/trunk/cucul/legacy.c (modified) (2 diffs)

libcaca/trunk/cucul/legacy.c

@@ -173 +173 @@
 }
 
-#if !defined(__KERNEL__)
 cucul_buffer_t *cucul_load_file(char const *file)
 {
     cucul_buffer_t *buf;
-    FILE *fp;
-    long int size;
-
-    fp = fopen(file, "rb");
-    if(!fp)
+    cucul_file_t *f;
+    int ret;
+
+    f = cucul_file_open(file, "rb");
+    if(!f)
         return NULL;
 
@@ -187 +186 @@
     if(!buf)
     {
-        fclose(fp);
-        return NULL;
-    }
-
-    fseek(fp, 0, SEEK_END);
-    size = ftell(fp);
-
-    buf->data = malloc(size);
-    if(!buf->data)
-    {
-        free(buf);
-        fclose(fp);
-        return NULL;
-    }
-    buf->size = size;
-    buf->user_data = 0;
-
-    fseek(fp, 0, SEEK_SET);
-    fread(buf->data, buf->size, 1, fp);
-    fclose(fp);
+        cucul_file_close(f);
+        return NULL;
+    }
+
+    buf->data = NULL;
+    buf->size = 0;
+
+    while(!cucul_file_eof(f))
+    {
+        buf->data = realloc(buf->data, buf->size + 1024);
+        if(!buf->data)
+        {
+            int saved_errno = geterrno();
+            free(buf);
+            cucul_file_close(f);
+            seterrno(saved_errno);
+            return NULL;
+        }
+
+        ret = cucul_file_read(f, buf->data + buf->size, 1024);
+        if(ret >= 0)
+            buf->size += ret;
+    }
+    cucul_file_close(f);
 
     return buf;
 }
-#endif
 
 unsigned long int cucul_get_buffer_size(cucul_buffer_t *buf)