Use more gcc attributes

git-svn-id: svn://svn.cc65.org/cc65/trunk@289 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/common/bitops.h b/src/common/bitops.h
index 8786fd016c30bdb73f6cd1799ec1ac6336e7aa52..af39a2e0fa1a878ecf92dbad2b849c2111963233 100644 (file)
--- a/src/common/bitops.h
+++ b/src/common/bitops.h
@@ -38,13 +38,17 @@
 
 
 
+#include "attrib.h"
+
+
+
 /*****************************************************************************/
 /*                                          Code                                    */
 /*****************************************************************************/
 
 
 
-unsigned BitFind (unsigned long Val);
+unsigned BitFind (unsigned long Val) attribute ((const));
 /* Find the first bit that is set in Val. Val must *not* be zero */
 
 void BitSet (void* Data, unsigned Bit);
@@ -53,10 +57,10 @@ void BitSet (void* Data, unsigned Bit);
 void BitReset (void* Data, unsigned Bit);
 /* Reset a bit in a char array */
 
-int BitIsSet (void* Data, unsigned Bit);
+int BitIsSet (void* Data, unsigned Bit) attribute ((const));
 /* Check if a bit is set in a char array */
 
-int BitIsReset (void* Data, unsigned Bit);
+int BitIsReset (void* Data, unsigned Bit) attribute ((const));
 /* Check if a bit is reset in a char array */
 
 void BitMerge (void* Target, const void* Source, unsigned Size);

diff --git a/src/common/cmdline.c b/src/common/cmdline.c
index 3403cdd7cb2980edebe961b40e187913891fce7f..b12feb7c08da886d45fbce4b9dfb3e3ad067f5ef 100644 (file)
--- a/src/common/cmdline.c
+++ b/src/common/cmdline.c
@@ -95,7 +95,7 @@ void InitCmdLine (unsigned aArgCount, char* aArgVec[], const char* aProgName)
 
 
 void UnknownOption (const char* Opt)
-/* Print an error about an unknown option. */
+/* Print an error about an unknown option and die. */
 {
     AbEnd ("Unknown option: %s\n", Opt);
 }

diff --git a/src/common/cmdline.h b/src/common/cmdline.h
index 1173e10b654b95e17c0439498da1d03fa435eaf5..bb582e451c334d6c6c8fc9a3f0353969af2049f8 100644 (file)
--- a/src/common/cmdline.h
+++ b/src/common/cmdline.h
@@ -38,6 +38,10 @@
 
 
 
+#include "attrib.h"
+
+
+
 /*****************************************************************************/
 /*                                          Data                                    */
 /*****************************************************************************/
@@ -69,13 +73,13 @@ void InitCmdLine (unsigned aArgCount, char* aArgVec[], const char* aProgName);
  * array. Both arguments are remembered in static storage.
  */
 
-void UnknownOption (const char* Opt);
-/* Print an error about an unknown option. */
+void UnknownOption (const char* Opt) attribute ((noreturn));
+/* Print an error about an unknown option and die. */
 
-void NeedArg (const char* Opt);
+void NeedArg (const char* Opt) attribute ((noreturn));
 /* Print an error about a missing option argument and exit. */
 
-void InvDef (const char* Def);
+void InvDef (const char* Def) attribute ((noreturn));
 /* Print an error about an invalid definition and die */
 
 const char* GetArg (int* ArgNum, unsigned Len);
@@ -91,6 +95,6 @@ void LongOption (int* ArgNum, const LongOpt* OptTab, unsigned OptCount);
 /* End of cmdline.h */
 
 #endif
-
+                                                   
 
 

diff --git a/src/common/hashstr.h b/src/common/hashstr.h
index af7f2796c877fa1b43e35b91c993d40d27e0ea84..21d1ef3b41cb12a34995a380384c668e2346db93 100644 (file)
--- a/src/common/hashstr.h
+++ b/src/common/hashstr.h
@@ -38,13 +38,17 @@
 
 
 
+#include "attrib.h"
+
+
+
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                          Code                                    */
 /*****************************************************************************/
 
 
 
-unsigned HashStr (const char* S);
+unsigned HashStr (const char* S) attribute ((const));
 /* Return a hash value for the given string */
 
 

diff --git a/src/common/make/gcc.mak b/src/common/make/gcc.mak
index 26c2e8ccd18eb4c7195b851c8f0f1c8ea93aaae3..6da3bd4ac20bb8fcbc8d5944219a0a71ad09f8c6 100644 (file)
--- a/src/common/make/gcc.mak
+++ b/src/common/make/gcc.mak
@@ -13,6 +13,7 @@ OBJS =        abend.o         \
        bitops.o        \
        check.o         \
        cmdline.o       \
+       coll.o          \
        exprdefs.o      \
        fname.o         \
        hashstr.o       \
@@ -53,4 +54,4 @@ depend dep:   $(OBJS:.o=.c)
        $(CC) -MM $^ > .depend
 
 
-                        
+

diff --git a/src/common/make/watcom.mak b/src/common/make/watcom.mak
index e8caa558fb4a4a258f54d8df088dcbd2ba064006..ce36404897f7c31b1a7c809c5c86033fe6d75718 100644 (file)
--- a/src/common/make/watcom.mak
+++ b/src/common/make/watcom.mak
@@ -69,6 +69,7 @@ OBJS =        abend.obj       \
        bitops.obj      \
        check.obj       \
        cmdline.obj     \
+       coll.obj        \
        exprdefs.obj    \
        fname.obj       \
        hashstr.obj     \