Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/etox
Dir : e17/libs/etox/src
Modified Files:
Etox_private.h etox.c etox_line.h
Log Message:
Fix some unitialized pointers that could cause problems, add a couple function
prototypes to remove warnings during compilation.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/Etox_private.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Etox_private.h 16 Aug 2003 06:09:32 -0000 1.20
+++ Etox_private.h 22 Aug 2003 16:13:10 -0000 1.21
@@ -185,6 +185,7 @@
Etox_Line * etox_index_to_line(Etox *et, int *i);
void etox_print_lines(Etox *et);
+void etox_selections_update(Evas_Object *bit, Etox_Line *line);
#include "etox_line.h"
#include "etox_obstacle.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- etox.c 21 Aug 2003 02:03:08 -0000 1.60
+++ etox.c 22 Aug 2003 16:13:10 -0000 1.61
@@ -176,7 +176,7 @@
void etox_append_text(Evas_Object * obj, char *text)
{
Etox *et;
- Evas_List *lines;
+ Evas_List *lines = NULL;
Etox_Line *end = NULL, *start;
CHECK_PARAM_POINTER("obj", obj);
@@ -258,7 +258,7 @@
void etox_prepend_text(Evas_Object * obj, char *text)
{
Etox *et;
- Evas_List *lines;
+ Evas_List *lines = NULL;
Etox_Line *end = NULL, *start;
CHECK_PARAM_POINTER("obj", obj);
@@ -345,7 +345,7 @@
{
Etox *et;
Evas_Object *bit;
- Evas_List *lines, *ll;
+ Evas_List *lines = NULL, *ll;
Etox_Line *start, *end, *temp;
CHECK_PARAM_POINTER("obj", obj);
@@ -553,9 +553,8 @@
void etox_set_layer(Evas_Object * obj, int layer)
{
Etox *et;
- Evas_Object *bit;
Etox_Line *line;
- Evas_List *l, *ll;
+ Evas_List *l;
CHECK_PARAM_POINTER("obj", obj);
@@ -719,9 +718,8 @@
double *w, double *h)
{
Etox *et;
- int sum;
+ int sum = 0;
Etox_Line *line = NULL;
- Evas_List *l;
CHECK_PARAM_POINTER("obj", obj);
@@ -735,8 +733,9 @@
if (w) *w = line->w / line->length;
if (y) *y = line->y;
if (x) *x = line->x + line->w;
- } else {
- etox_line_index_to_geometry(line, index - sum, x, y, w, h);
+ }
+ else {
+ etox_line_index_to_geometry(line, index - sum, x, y, w, h);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_line.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etox_line.h 19 Aug 2003 05:49:26 -0000 1.11
+++ etox_line.h 22 Aug 2003 16:13:10 -0000 1.12
@@ -19,6 +19,8 @@
void etox_line_unwrap(Etox *et, Etox_Line *line);
Evas_Object *etox_line_coord_to_bit(Etox_Line *line, int x);
Evas_Object *etox_line_index_to_bit(Etox_Line *line, int *i);
+void etox_line_index_to_geometry(Etox_Line *line, int index, double *x,
+ double *y, double *w, double *h);
void etox_line_print_bits(Etox_Line *line);
void etox_line_set_layer(Etox_Line *line, int layer);
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
