Move the ValidSegName function into common (segdefs)

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

diff --git a/src/cc65/main.c b/src/cc65/main.c
index 28ba50dd830b3e0550be2f296ae62e0a11b26390..f6686765df73668ed0214fd66443a41c97de62cc 100644 (file)
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -44,6 +44,7 @@
 #include "cmdline.h"
 #include "fname.h"
 #include "print.h"
+#include "segdefs.h"
 #include "target.h"
 #include "tgttrans.h"
 #include "version.h"

diff --git a/src/cc65/pragma.c b/src/cc65/pragma.c
index 9c452a855066b5b7426b942742cc549113584a21..9a546efc7254d837ba693f827f2514779a665098 100644 (file)
--- a/src/cc65/pragma.c
+++ b/src/cc65/pragma.c
@@ -37,6 +37,7 @@
 #include <string.h>
 
 /* common */
+#include "segdefs.h"
 #include "tgttrans.h"
 
 /* cc65 */
@@ -47,7 +48,6 @@
 #include "litpool.h"
 #include "scanner.h"
 #include "scanstrbuf.h"
-#include "segments.h"
 #include "symtab.h"
 #include "pragma.h"
 

diff --git a/src/cc65/segments.c b/src/cc65/segments.c
index 77b787ca84e1881fb0114ab97800157b108aa835..c2f080fabc2813edd0fae54d54de122c9cb3f782 100644 (file)
--- a/src/cc65/segments.c
+++ b/src/cc65/segments.c
@@ -103,27 +103,6 @@ void NewSegName (segment_t Seg, const char* Name)
 
 
 
-int ValidSegName (const char* Name)
-/* Return true if the given segment name is valid, return false otherwise */
-{
-    /* Must start with '_' or a letter */
-    if ((*Name != '_' && !IsAlpha(*Name)) || strlen(Name) > 80) {
-               return 0;
-    }
-
-    /* Can have letters, digits or the underline */
-    while (*++Name) {
-               if (*Name != '_' && !IsAlNum(*Name)) {
-                   return 0;
-               }
-    }
-
-    /* Name is ok */
-    return 1;
-}
-
-
-
 static Segments* NewSegments (SymEntry* Func)
 /* Initialize a Segments structure (set all fields to NULL) */
 {

diff --git a/src/cc65/segments.h b/src/cc65/segments.h
index fde43933d583c6de23abb5b078305e10dd09432e..e7590ee14a672e02e975ba1aea653294fb8c553a 100644 (file)
--- a/src/cc65/segments.h
+++ b/src/cc65/segments.h
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2001 Ullrich von Bassewitz                                       */
+/* (C) 2000-2002 Ullrich von Bassewitz                                       */
 /*               Wacholderweg 14                                             */
 /*               D-70597 Stuttgart                                           */
 /* EMail:        uz@cc65.org                                                 */
@@ -108,9 +108,6 @@ void InitSegNames (void);
 void NewSegName (segment_t Seg, const char* Name);
 /* Set a new name for a segment */
 
-int ValidSegName (const char* Name);
-/* Return true if the given segment name is valid, return false otherwise */
-
 Segments* PushSegments (struct SymEntry* Func);
 /* Make the new segment list current but remember the old one */