Changeset 1307 for libcaca/trunkTweet

Timestamp:

Nov 8, 2006, 6:18:23 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Set the cucul_import_memory() buffer type to void const * instead of unsigned char const * so that C++ programs won't complain.

_ _ _ _

/ _ \| \/ |/ _| / _ \ / _ \ / _ \

| | | | |\/| | | _ | (_) | (_) | (_) |
| |_| | | | | |_| | \, |\, |\, |

\_/|_| |_|\| /_/ /_/ /_/

Location:

libcaca/trunk/cucul

Files:

• cucul.h (modified) (1 diff)
• import.c (modified) (2 diffs)

libcaca/trunk/cucul/cucul.h

@@ -217 +217 @@
  *
  *  @{ */
-long int cucul_import_memory(cucul_canvas_t *, unsigned char const *,
+long int cucul_import_memory(cucul_canvas_t *, void const *,
                              unsigned long int, char const *);
 long int cucul_import_file(cucul_canvas_t *, char const *, char const *);

libcaca/trunk/cucul/import.c

@@ -83 +83 @@
  *  \return The number of bytes read, or -1 if an error occurred.
  */
-long int cucul_import_memory(cucul_canvas_t *cv, unsigned char const *buf,
+long int cucul_import_memory(cucul_canvas_t *cv, void const *buf,
                              unsigned long int len, char const *format)
 {
@@ -98 +98 @@
     if(!strcasecmp("", format))
     {
+        unsigned char const *str = buf;
         unsigned int i;
 
         /* If 4 first bytes are 0xcaca + 'CV' */
-        if(len >= 4 && buf[0] == 0xca &&
-           buf[1] == 0xca && buf[2] == 'C' && buf[3] == 'V')
+        if(len >= 4 && str[0] == 0xca &&
+           str[1] == 0xca && str[2] == 'C' && str[3] == 'V')
             return import_caca(cv, buf, len);
 
         /* If we find ESC[ argv, we guess it's an ANSI file */
         for(i = 0; i + 1 < len; i++)
-            if((buf[i] == 0x1b) && (buf[i + 1] == '['))
+            if((str[i] == 0x1b) && (str[i + 1] == '['))
                 return import_ansi(cv, buf, len, 0);