Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / ca65 / spool.h

diff --git a/src/ca65/spool.h b/src/ca65/spool.h
index 9066bc9a16e2bf20418eb90266c8f6bddcb39ecc..e8d1152985f2a0bca2d683e19eaf5116b8cbccdc 100644 (file)
--- a/src/ca65/spool.h
+++ b/src/ca65/spool.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -44,17 +44,21 @@
 
 
 /*****************************************************************************/
-/*                                          Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-extern StringPool StrPool;
+/* The index for an empty string */
+#define EMPTY_STRING_ID         0U
+
+/* The string pool */
+extern StringPool* StrPool;
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -63,51 +67,50 @@ extern StringPool StrPool;
 INLINE unsigned GetStrBufId (const StrBuf* S)
 /* Return the id of the given string buffer */
 {
-    return SP_Add (&StrPool, S);
+    return SP_Add (StrPool, S);
 }
 #else
-#  define GetStringId(S)        SP_Add (&StrPool, (S))
+#  define GetStrBufId(S)        SP_Add (StrPool, (S))
 #endif
 
 #if defined(HAVE_INLINE)
 INLINE unsigned GetStringId (const char* S)
 /* Return the id of the given string */
 {
-    return SP_AddStr (&StrPool, S);
+    return SP_AddStr (StrPool, S);
 }
 #else
-#  define GetStringId(S)        SP_Add (&StrPool, (S))
+#  define GetStringId(S)        SP_AddStr (StrPool, (S))
 #endif
 
 #if defined(HAVE_INLINE)
 INLINE const StrBuf* GetStrBuf (unsigned Index)
 /* Convert a string index into a string */
 {
-    return SP_Get (&StrPool, Index);
+    return SP_Get (StrPool, Index);
 }
 #else
-#  define GetStrBuf(Index)      SP_Get (&StrPool, (Index))
+#  define GetStrBuf(Index)      SP_Get (StrPool, (Index))
 #endif
 
 #if defined(HAVE_INLINE)
 INLINE const char* GetString (unsigned Index)
 /* Convert a string index into a string */
 {
-    return SB_GetConstBuf (SP_Get (&StrPool, Index));
+    return SB_GetConstBuf (SP_Get (StrPool, Index));
 }
 #else
-#  define GetString(Index)      SB_GetConstBuf (SP_Get (&StrPool, (Index)))
+#  define GetString(Index)      SB_GetConstBuf (SP_Get (StrPool, (Index)))
 #endif
 
 void WriteStrPool (void);
 /* Write the string pool to the object file */
 
+void InitStrPool (void);
+/* Initialize the string pool */
+
 
 
 /* End of spool.h */
 
 #endif
-
-
-
-