Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
Engrave.h Makefile.am engrave_data.c engrave_file.c
engrave_font.c engrave_group.c engrave_image.c engrave_load.c
engrave_macros.h engrave_out.c engrave_parse.c engrave_part.c
engrave_part_state.c engrave_program.c
Log Message:
- don't export the macros as they may conflict with other things
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/Engrave.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Engrave.h 12 Nov 2004 20:08:56 -0000 1.8
+++ Engrave.h 13 Nov 2004 20:50:20 -0000 1.9
@@ -79,7 +79,6 @@
#include <string.h>
#include <Evas.h>
-#include <engrave_macros.h>
#include <engrave_enums.h>
#include <engrave_data.h>
#include <engrave_image.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 22 Oct 2004 01:43:14 -0000 1.4
+++ Makefile.am 13 Nov 2004 20:50:20 -0000 1.5
@@ -23,7 +23,6 @@
engrave_group.h \
engrave_image.h \
engrave_load.h \
- engrave_macros.h \
engrave_out.h \
engrave_parse.h \
engrave_part.h \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_data.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- engrave_data.c 12 Nov 2004 07:28:29 -0000 1.4
+++ engrave_data.c 13 Nov 2004 20:50:20 -0000 1.5
@@ -1,4 +1,5 @@
#include <Engrave.h>
+#include "engrave_macros.h"
/**
* engrave_data_new - create a new data block
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_file.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- engrave_file.c 12 Nov 2004 20:14:36 -0000 1.7
+++ engrave_file.c 13 Nov 2004 20:50:20 -0000 1.8
@@ -1,4 +1,5 @@
#include <Engrave.h>
+#include "engrave_macros.h"
/**
* engrave_file_new - create a new Engrave_File object
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_font.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- engrave_font.c 12 Nov 2004 07:28:29 -0000 1.4
+++ engrave_font.c 13 Nov 2004 20:50:20 -0000 1.5
@@ -1,4 +1,5 @@
#include <Engrave.h>
+#include "engrave_macros.h"
/**
* engrave_font_new - create a new Engrave_Font object.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_group.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- engrave_group.c 12 Nov 2004 20:08:56 -0000 1.6
+++ engrave_group.c 13 Nov 2004 20:50:20 -0000 1.7
@@ -1,4 +1,5 @@
#include <Engrave.h>
+#include "engrave_macros.h"
/**
* engrave_group_new - create a new Engrave_Group object.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_image.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- engrave_image.c 12 Nov 2004 07:28:29 -0000 1.5
+++ engrave_image.c 13 Nov 2004 20:50:20 -0000 1.6
@@ -1,4 +1,5 @@
#include <Engrave.h>
+#include "engrave_macros.h"
/**
* engrave_image_new - create a new Engrave_Image object.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_load.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- engrave_load.c 24 Oct 2004 07:06:37 -0000 1.7
+++ engrave_load.c 13 Nov 2004 20:50:20 -0000 1.8
@@ -1,7 +1,8 @@
#include <errno.h>
-#include "Engrave.h"
+#include <Engrave.h>
#include "engrave_parse.h"
+#include "engrave_macros.h"
#define MAIN_EDC_NAME "main_edje_source.edc"
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_macros.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- engrave_macros.h 24 Oct 2004 06:28:37 -0000 1.3
+++ engrave_macros.h 13 Nov 2004 20:50:20 -0000 1.4
@@ -1,47 +1,20 @@
#ifndef ENGRAVE_MACROS_H
#define ENGRAVE_MACROS_H
-/**
- * @file engrave_macros.h Macros used in the code and available to programs.
- * @brief Contains a set of macros that are used in Engrave and available to
programs.
- */
-
-/**
- * @defgroup Engrave_Macros Macros: Macros used internally and available
externally
- *
- * @{
- */
-
#undef NEW
-/**
-* @def NEW(type, num)
-* Allocates memory of @a num elements of sizeof(@a type).
-*/
#define NEW(type, num) calloc(num, sizeof(type))
#undef FREE
-/**
- * @def FREE(val)
- * Free the data pointed to by @a val and set to NULL
- */
#define FREE(val) \
{ \
free(val); val = NULL; \
}
#undef IF_FREE
-/**
- * @def IF_FREE(val)
- * If @a val is non-NULL, free @a val and assign to NULL
- */
#define IF_FREE(val) \
{ \
if (val) FREE(val) \
}
-/**
- * @}
- */
-
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- engrave_out.c 12 Nov 2004 23:38:17 -0000 1.13
+++ engrave_out.c 13 Nov 2004 20:50:20 -0000 1.14
@@ -1,7 +1,8 @@
#include <errno.h>
#include <stdio.h>
#include <stdarg.h>
-#include "Engrave.h"
+#include <Engrave.h>
+#include "engrave_macros.h"
static void _engrave_output_part(Engrave_Part *part, void *data);
static void _engrave_output_program(Engrave_Program *program, void *data);
@@ -203,7 +204,7 @@
tmp = engrave_group_name_get(group);
engrave_out_data(out, "name", "\"%s\"", tmp);
- if (tmp) free(tmp);
+ IF_FREE(tmp);
engrave_group_min_size_get(group, &w, &h);
if (w != 0 || h != 0)
@@ -228,7 +229,7 @@
/* FIXME scripts are wierd... */
fprintf(out, "%s", tmp);
engrave_out_end(out);
- free(tmp);
+ FREE(tmp);
}
/* parts */
@@ -256,7 +257,7 @@
tmp = engrave_part_name_get(part);
engrave_out_data(out, "name", "\"%s\"", tmp);
- if (tmp) free(tmp);
+ IF_FREE(tmp);
engrave_out_data(out, "type", "%s",
_part_type_string[engrave_part_type_get(part)]);
@@ -277,7 +278,7 @@
if (tmp)
{
engrave_out_data(out, "clip_to", "\"%s\"", tmp);
- free(tmp);
+ FREE(tmp);
}
engrave_part_dragable_x_get(part, &x, &step_x, &count_x);
@@ -292,7 +293,7 @@
if (tmp)
{
engrave_out_data(out, "confine", "\"%s\"", tmp);
- free(tmp);
+ FREE(tmp);
}
engrave_out_end(out);
}
@@ -313,15 +314,15 @@
tmp = engrave_program_name_get(program);
engrave_out_data(out, "name", "\"%s\"", tmp);
- if (tmp) free(tmp);
+ IF_FREE(tmp);
tmp = engrave_program_signal_get(program);
engrave_out_data(out, "signal", "\"%s\"", tmp);
- if (tmp) free(tmp);
+ IF_FREE(tmp);
tmp = engrave_program_source_get(program);
engrave_out_data(out, "source", "\"%s\"", tmp);
- if (tmp) free(tmp);
+ IF_FREE(tmp);
engrave_program_action_get(program, &action, state,
state2, &value, &value2);
@@ -365,7 +366,7 @@
/* FIXME scripts are wierd ... */
fprintf(out, "%s", script);
engrave_out_end(out);
- free(script);
+ FREE(script);
}
}
break;
@@ -546,7 +547,7 @@
engrave_out_data(out, "image", "\"%s\" %s", name,
_image_type_string[engrave_image_type_get(image)]);
- if (name) free(name);
+ IF_FREE(name);
}
static void
@@ -560,8 +561,8 @@
path = engrave_font_path_get(font);
engrave_out_data(out, "font", "\"%s\" \"%s\"", path, name);
- if (name) free(name);
- if (path) free(path);
+ IF_FREE(name);
+ IF_FREE(path);
}
static void
@@ -580,8 +581,8 @@
engrave_out_data(out, "item", "\"%s\" %d",
key, engrave_data_int_value_get(data));
- free(key);
- free(value);
+ IF_FREE(key);
+ IF_FREE(value);
}
static void
@@ -605,7 +606,7 @@
char *name = engrave_image_name_get(ei);
engrave_out_data(out, "tween", "\"%s\"", name);
- if (name) free(name);
+ IF_FREE(name);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_parse.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- engrave_parse.c 10 Nov 2004 20:33:21 -0000 1.7
+++ engrave_parse.c 13 Nov 2004 20:50:20 -0000 1.8
@@ -1,4 +1,4 @@
-#include "Engrave.h"
+#include <Engrave.h>
static Engrave_File *engrave_file = 0;
extern FILE *yyin;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- engrave_part.c 12 Nov 2004 22:31:22 -0000 1.7
+++ engrave_part.c 13 Nov 2004 20:50:20 -0000 1.8
@@ -1,4 +1,5 @@
#include <Engrave.h>
+#include "engrave_macros.h"
/**
* engrave_part_new - create a new part object.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- engrave_part_state.c 12 Nov 2004 20:08:57 -0000 1.7
+++ engrave_part_state.c 13 Nov 2004 20:50:20 -0000 1.8
@@ -1,4 +1,5 @@
#include <Engrave.h>
+#include "engrave_macros.h"
/**
* engrave_part_state_new - create a new Engrave_Part_State object.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_program.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- engrave_program.c 12 Nov 2004 23:38:17 -0000 1.6
+++ engrave_program.c 13 Nov 2004 20:50:20 -0000 1.7
@@ -1,4 +1,5 @@
#include <Engrave.h>
+#include "engrave_macros.h"
/**
* engrave_program_new - create a new Engrave_Program object.
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs