Merge pull request #494 from jedeoric/master

[cc65] / src / da65 / asminc.c

diff --git a/src/da65/asminc.c b/src/da65/asminc.c
index 028aa03f9f29a84a7e17387687afe11eb8532a4e..06a397d52fa061536c9d0b0c9726d27fecbdce0f 100644 (file)
--- a/src/da65/asminc.c
+++ b/src/da65/asminc.c
@@ -6,8 +6,8 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2005      Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
+/* (C) 2005-2008 Ullrich von Bassewitz                                       */
+/*               Roemerstrasse 52                                            */
 /*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
@@ -49,7 +49,7 @@
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -84,7 +84,7 @@ void AsmInc (const char* Filename, char CommentStart, int IgnoreUnknown)
     char*       L;
     const char* Comment;
     unsigned    Line;
-    unsigned   Len;
+    unsigned    Len;
     long        Val;
     unsigned    DVal;
     int         Sign;
@@ -111,12 +111,12 @@ void AsmInc (const char* Filename, char CommentStart, int IgnoreUnknown)
             ++L;
         }
 
-       /* Remove trailing whitespace */
-       Len = strlen (L);
-       while (Len > 0 && IsSpace (L[Len-1])) {
-           --Len;
-       }
-       L[Len] = '\0';
+        /* Remove trailing whitespace */
+        Len = strlen (L);
+        while (Len > 0 && IsSpace (L[Len-1])) {
+            --Len;
+        }
+        L[Len] = '\0';
 
         /* If the line is empty or starts with a comment char, ignore it */
         if (*L == '\0' || *L == CommentStart) {
@@ -147,11 +147,11 @@ void AsmInc (const char* Filename, char CommentStart, int IgnoreUnknown)
         } else if (*L == ':' && *++L == '=') {
             ++L;
         } else {
-           if (!IgnoreUnknown) {
-               Error ("%s(%u): Missing `='", Filename, Line);
-           }
-           continue;
-       }
+            if (!IgnoreUnknown) {
+                Error ("%s(%u): Missing `='", Filename, Line);
+            }
+            continue;
+        }
 
         /* Allow white space once again */
         L = SkipWhitespace (L);
@@ -168,8 +168,8 @@ void AsmInc (const char* Filename, char CommentStart, int IgnoreUnknown)
         }
 
         /* Determine the base of the number. Allow $ and % as prefixes for
-         * hex and binary numbers respectively.
-         */
+        ** hex and binary numbers respectively.
+        */
         if (*L == '$') {
             Base = 16;
             ++L;
@@ -228,11 +228,8 @@ void AsmInc (const char* Filename, char CommentStart, int IgnoreUnknown)
     }
 
     /* Delete the string buffer contents */
-    DoneStrBuf (&Ident);
+    SB_Done (&Ident);
 
     /* Close the include file ignoring errors (we were just reading). */
     (void) fclose (F);
 }
-
-
-