Some more warnings hunting.
diff -ru evas.orig/src/lib/Evas.h evas/src/lib/Evas.h
--- evas.orig/src/lib/Evas.h 2005-05-21 19:20:05.000000000 +0200
+++ evas/src/lib/Evas.h 2005-05-21 19:23:20.000000000 +0200
@@ -263,9 +263,9 @@
Evas_Modifier *modifiers;
Evas_Lock *locks;
- char *key; /**< The logical key : (eg shift+1 == exclamation) */
- char *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */
- char *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */
+ const char *key; /**< The logical key : (eg shift+1 == exclamation) */
+ const char *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */
+ const char *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */
};
struct _Evas_Event_Key_Up /** Key release event */
@@ -275,9 +275,9 @@
Evas_Modifier *modifiers;
Evas_Lock *locks;
- char *key; /**< The logical key : (eg shift+1 == exclamation) */
- char *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */
- char *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */
+ const char *key; /**< The logical key : (eg shift+1 == exclamation) */
+ const char *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */
+ const char *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */
};
#ifdef __cplusplus
diff -ru evas.orig/src/lib/canvas/evas_font_dir.c evas/src/lib/canvas/evas_font_dir.c
--- evas.orig/src/lib/canvas/evas_font_dir.c 2005-05-21 19:20:05.000000000 +0200
+++ evas/src/lib/canvas/evas_font_dir.c 2005-05-21 19:39:28.000000000 +0200
@@ -87,7 +87,7 @@
}
static Evas_List *
-evas_font_set_get(char *name)
+evas_font_set_get(const char *name)
{
Evas_List *fonts = NULL;
char *p;
@@ -99,7 +99,8 @@
}
else
{
- char *nm, *pp;
+ const char *pp;
+ char *nm;
pp = name;
while (p)
@@ -153,7 +154,7 @@
}
void *
-evas_font_load(Evas *evas, char *name, char *source, int size)
+evas_font_load(Evas *evas, const char *name, const char *source, int size)
{
void *font = NULL;
Evas_List *fonts, *l;
diff -ru evas.orig/src/lib/canvas/evas_object_image.c evas/src/lib/canvas/evas_object_image.c
--- evas.orig/src/lib/canvas/evas_object_image.c 2005-05-21 19:20:05.000000000 +0200
+++ evas/src/lib/canvas/evas_object_image.c 2005-05-21 19:27:16.000000000 +0200
@@ -905,8 +905,8 @@
1,
&image_pixels);
if (image_pixels)
- evas_common_convert_yuv_420p_601_rgba(pixels->rows,
- image_pixels,
+ evas_common_convert_yuv_420p_601_rgba((DATA8 **) pixels->rows,
+ (DATA8 *) image_pixels,
o->cur.image.w,
o->cur.image.h);
if (o->engine_data)
diff -ru evas.orig/src/lib/canvas/evas_object_text.c evas/src/lib/canvas/evas_object_text.c
--- evas.orig/src/lib/canvas/evas_object_text.c 2005-05-21 19:20:05.000000000 +0200
+++ evas/src/lib/canvas/evas_object_text.c 2005-05-21 19:31:14.000000000 +0200
@@ -749,7 +749,7 @@
if (!str) return 0;
if (pos < 0) return 0;
p = pos;
- d = evas_common_font_utf8_get_next((char *)str, &p);
+ d = evas_common_font_utf8_get_next((unsigned char *)str, &p);
if (decoded) *decoded = d;
return p;
}
@@ -769,7 +769,7 @@
if (!str) return 0;
if (pos < 1) return 0;
p = pos;
- d = evas_common_font_utf8_get_prev((char *)str, &p);
+ d = evas_common_font_utf8_get_prev((unsigned char *)str, &p);
if (decoded) *decoded = d;
return p;
}
diff -ru evas.orig/src/lib/engines/software_x11/evas_outbuf.c evas/src/lib/engines/software_x11/evas_outbuf.c
--- evas.orig/src/lib/engines/software_x11/evas_outbuf.c 2005-05-21 19:20:05.000000000 +0200
+++ evas/src/lib/engines/software_x11/evas_outbuf.c 2005-05-21 19:53:35.000000000 +0200
@@ -259,7 +259,7 @@
w, h,
use_shm,
NULL);
- im->image->data = evas_software_x11_x_output_buffer_data(obr->xob, &bpl);
+ im->image->data = (DATA32 *) evas_software_x11_x_output_buffer_data(obr->xob, &bpl);
if (buf->priv.x.mask)
obr->mxob = evas_software_x11_x_output_buffer_new(buf->priv.x.disp,
buf->priv.x.vis,
diff -ru evas.orig/src/lib/file/evas_path.c evas/src/lib/file/evas_path.c
--- evas.orig/src/lib/file/evas_path.c 2005-05-21 19:20:05.000000000 +0200
+++ evas/src/lib/file/evas_path.c 2005-05-21 19:41:39.000000000 +0200
@@ -28,7 +28,7 @@
}
char *
-evas_file_path_join(char *path, char *end)
+evas_file_path_join(const char *path, const char *end)
{
char *res = NULL;
int len;
diff -ru evas.orig/src/lib/include/evas_private.h evas/src/lib/include/evas_private.h
--- evas.orig/src/lib/include/evas_private.h 2005-05-21 19:20:05.000000000 +0200
+++ evas/src/lib/include/evas_private.h 2005-05-21 19:40:29.000000000 +0200
@@ -654,7 +654,7 @@
int evas_event_passes_through(Evas_Object *obj);
Evas_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y);
int evas_file_path_is_full_path(char *path);
-char *evas_file_path_join(char *path, char *end);
+char *evas_file_path_join(const char *path, const char *end);
int evas_file_path_exists(char *path);
int evas_file_path_is_file(char *path);
int evas_file_path_is_dir(char *path);
@@ -695,7 +695,7 @@
void evas_font_dir_cache_free(void);
char *evas_font_dir_cache_find(char *dir, char *font);
void evas_font_free(Evas *evas, void *font);
-void *evas_font_load(Evas *evas, char *name, char *source, int size);
+void *evas_font_load(Evas *evas, const char *name, const char *source, int size);
extern int _evas_alloc_error;
