More renaming

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

diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c
index 37960013012a5166b7b6992ad1a7b5829a323739..92b95469320b6a3ea91121a5dee0b92986fa428d 100644 (file)
--- a/src/cc65/codegen.c
+++ b/src/cc65/codegen.c
@@ -220,7 +220,7 @@ static void OutputDataLine (DataSeg* S, const char* Format, ...)
 {
     va_list ap;
     va_start (ap, Format);
-    AddDataEntry (S, Format, ap);
+    DS_AddLine (S, Format, ap);
     va_end (ap);
 }
 

diff --git a/src/cc65/codeseg.c b/src/cc65/codeseg.c
index 89029350bac47e9a757b8d7f03651592c61b67d9..44601c591524ff22b5b7d16fd0a36504b9886370 100644 (file)
--- a/src/cc65/codeseg.c
+++ b/src/cc65/codeseg.c
@@ -426,7 +426,7 @@ void CS_AddEntry (CodeSeg* S, struct CodeEntry* E, LineInfo* LI)
 
 
 
-void CS_AddEntryLine (CodeSeg* S, LineInfo* LI, const char* Format, va_list ap)
+void CS_AddLine (CodeSeg* S, LineInfo* LI, const char* Format, va_list ap)
 /* Add a line to the given code segment */
 {
     const char* L;

diff --git a/src/cc65/codeseg.h b/src/cc65/codeseg.h
index d29f7c83857afad88d05c284bfb727b562877d5d..b98bf3e067539e7020378e919a4a04af5e6b927b 100644 (file)
--- a/src/cc65/codeseg.h
+++ b/src/cc65/codeseg.h
@@ -97,7 +97,7 @@ CodeSeg* NewCodeSeg (const char* SegName, SymEntry* Func);
 void CS_AddEntry (CodeSeg* S, struct CodeEntry* E, LineInfo* LI);
 /* Add an entry to the given code segment */
 
-void CS_AddEntryLine (CodeSeg* S, LineInfo* LI, const char* Format, va_list ap) attribute ((format(printf,3,0)));
+void CS_AddLine (CodeSeg* S, LineInfo* LI, const char* Format, va_list ap) attribute ((format(printf,3,0)));
 /* Add a line to the given code segment */
 
 void CS_InsertEntry (CodeSeg* S, struct CodeEntry* E, unsigned Index);

diff --git a/src/cc65/dataseg.c b/src/cc65/dataseg.c
index 78b10eb7e340b37cc0667162e09beacc65cdb57c..bcc51d2a7ae48e8542711aa05c3d71325facad2c 100644 (file)
--- a/src/cc65/dataseg.c
+++ b/src/cc65/dataseg.c
@@ -67,7 +67,7 @@ DataSeg* NewDataSeg (const char* Name, SymEntry* Func)
 
 
 
-void AppendDataSeg (DataSeg* Target, const DataSeg* Source)
+void DS_Append (DataSeg* Target, const DataSeg* Source)
 /* Append the data from Source to Target */
 {
     unsigned I;
@@ -81,7 +81,7 @@ void AppendDataSeg (DataSeg* Target, const DataSeg* Source)
 
 
 
-void AddDataEntry (DataSeg* S, const char* Format, va_list ap)
+void DS_AddLine (DataSeg* S, const char* Format, va_list ap)
 /* Add a line to the given data segment */
 {
     /* Format the line */
@@ -94,7 +94,7 @@ void AddDataEntry (DataSeg* S, const char* Format, va_list ap)
 
 
 
-void OutputDataSeg (const DataSeg* S, FILE* F)
+void DS_Output (const DataSeg* S, FILE* F)
 /* Output the data segment data to a file */
 {
     unsigned I;
@@ -121,3 +121,4 @@ void OutputDataSeg (const DataSeg* S, FILE* F)
 
 
 
+

diff --git a/src/cc65/dataseg.h b/src/cc65/dataseg.h
index 50d692af781cf291c751cd83575072f6f1f39bd2..ac1cb4fcc31048dae65010c036f0112ef47a9eb8 100644 (file)
--- a/src/cc65/dataseg.h
+++ b/src/cc65/dataseg.h
@@ -58,8 +58,8 @@
 
 typedef struct DataSeg DataSeg;
 struct DataSeg {
-    char*              SegName;        /* Segment name */
-    SymEntry*          Func;           /* Owner function */
+    char*                      SegName;        /* Segment name */
+    SymEntry*                  Func;           /* Owner function */
     Collection                 Lines;          /* List of code lines */
 };
 
@@ -74,13 +74,13 @@ struct DataSeg {
 DataSeg* NewDataSeg (const char* SegName, SymEntry* Func);
 /* Create a new data segment, initialize and return it */
 
-void AppendDataSeg (DataSeg* Target, const DataSeg* Source);
+void DS_Append (DataSeg* Target, const DataSeg* Source);
 /* Append the data from Source to Target. */
 
-void AddDataEntry (DataSeg* S, const char* Format, va_list ap) attribute ((format(printf,2,0)));
+void DS_AddLine (DataSeg* S, const char* Format, va_list ap) attribute ((format(printf,2,0)));
 /* Add a line to the given data segment */
 
-void OutputDataSeg (const DataSeg* S, FILE* F);
+void DS_Output (const DataSeg* S, FILE* F);
 /* Output the data segment data to a file */
 
 

diff --git a/src/cc65/segments.c b/src/cc65/segments.c
index 3dad3ab892838e92abd8731294a2ba984d3fc904..b5ba646c4bfe459612270e9403020ff81cca7b6d 100644 (file)
--- a/src/cc65/segments.c
+++ b/src/cc65/segments.c
@@ -201,7 +201,7 @@ void AddTextLine (const char* Format, ...)
     va_list ap;
     va_start (ap, Format);
     CHECK (CS != 0);
-    AddTextEntry (CS->Text, Format, ap);
+    TS_AddLine (CS->Text, Format, ap);
     va_end (ap);
 }
 
@@ -213,7 +213,7 @@ void AddCodeLine (const char* Format, ...)
     va_list ap;
     va_start (ap, Format);
     CHECK (CS != 0);
-    CS_AddEntryLine (CS->Code, CurTok.LI, Format, ap);
+    CS_AddLine (CS->Code, CurTok.LI, Format, ap);
     va_end (ap);
 }
 
@@ -234,7 +234,7 @@ void AddDataLine (const char* Format, ...)
     va_list ap;
     va_start (ap, Format);
     CHECK (CS != 0);
-    AddDataEntry (GetDataSeg(), Format, ap);
+    DS_AddLine (GetDataSeg(), Format, ap);
     va_end (ap);
 }
 
@@ -264,12 +264,12 @@ void OutputSegments (const Segments* S, FILE* F)
     }
 
     /* Output the text segment */
-    OutputTextSeg (S->Text, F);
+    TS_Output (S->Text, F);
 
     /* Output the three data segments */
-    OutputDataSeg (S->Data, F);
-    OutputDataSeg (S->ROData, F);
-    OutputDataSeg (S->BSS, F);
+    DS_Output (S->Data, F);
+    DS_Output (S->ROData, F);
+    DS_Output (S->BSS, F);
 
     /* Output the code segment */
     CS_Output (S->Code, F);

diff --git a/src/cc65/textseg.c b/src/cc65/textseg.c
index 0dd302bfc828b3f0c4416da32ace8563d6bae673..3ca44990eac271b5123490caeba25cfca101f0af 100644 (file)
--- a/src/cc65/textseg.c
+++ b/src/cc65/textseg.c
@@ -70,7 +70,7 @@ TextSeg* NewTextSeg (SymEntry* Func)
 
 
 
-void AddTextEntry (TextSeg* S, const char* Format, va_list ap)
+void TS_AddLine (TextSeg* S, const char* Format, va_list ap)
 /* Add a line to the given text segment */
 {
     /* Format the line */
@@ -83,7 +83,7 @@ void AddTextEntry (TextSeg* S, const char* Format, va_list ap)
 
 
 
-void OutputTextSeg (const TextSeg* S, FILE* F)
+void TS_Output (const TextSeg* S, FILE* F)
 /* Output the text segment data to a file */
 {
     unsigned I;

diff --git a/src/cc65/textseg.h b/src/cc65/textseg.h
index c96a522f7aaa9870ed1942658efef9a3aabc80a8..eeeb4d3fd654c1dc4d981c087c5487b203dc1118 100644 (file)
--- a/src/cc65/textseg.h
+++ b/src/cc65/textseg.h
@@ -79,10 +79,10 @@ struct TextSeg {
 TextSeg* NewTextSeg (SymEntry* Func);
 /* Create a new text segment, initialize and return it */
 
-void AddTextEntry (TextSeg* S, const char* Format, va_list ap) attribute ((format(printf,2,0)));
+void TS_AddLine (TextSeg* S, const char* Format, va_list ap) attribute ((format(printf,2,0)));
 /* Add a line to the given text segment */
 
-void OutputTextSeg (const TextSeg* S, FILE* F);
+void TS_Output (const TextSeg* S, FILE* F);
 /* Output the text segment data to a file */