Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/include/libast
Modified Files:
str.h
Log Message:
Thu Oct 30 16:03:29 2003 Michael Jennings (mej)
Make SPIF_STR_STR() convenience macro *always* return a string, even
if the str object is NULL.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/str.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- str.h 19 Feb 2003 21:10:28 -0000 1.13
+++ str.h 30 Oct 2003 21:04:05 -0000 1.14
@@ -24,14 +24,8 @@
#ifndef _LIBAST_STR_H_
#define _LIBAST_STR_H_
-/* Cast an arbitrary object pointer to a str. */
#define SPIF_STR(obj) ((spif_str_t) (obj))
-#define SPIF_STR_STR(obj) ((const spif_charptr_t) (SPIF_STR(obj)->s))
-
-/* Check to see if a pointer references a string object. */
#define SPIF_OBJ_IS_STR(obj) (SPIF_OBJ_IS_TYPE(obj, str))
-
-/* Check for NULL str object */
#define SPIF_STR_ISNULL(s) SPIF_OBJ_ISNULL(SPIF_OBJ(s))
#define SPIF_STR_NEW(type)
SPIF_STR((SPIF_CLASS(SPIF_CLASS_VAR(type)))->noo())
@@ -42,6 +36,10 @@
#define SPIF_STR_COMP(o1, o2) SPIF_OBJ_COMP(o1, o2)
#define SPIF_STR_DUP(obj) SPIF_OBJ_DUP(obj)
#define SPIF_STR_TYPE(obj) SPIF_OBJ_TYPE(obj)
+
+#define SPIF_STR_STR(obj) (SPIF_CONST_CAST(charptr)
((SPIF_STR_ISNULL(obj)) \
+ ? (SPIF_CAST(charptr)
"") \
+ : (SPIF_STR(obj)->s)))
SPIF_DEFINE_OBJ(str) {
SPIF_DECL_PARENT_TYPE(obj);
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
