From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Thu, 27 Jan 2011 17:35:48 +0000 (+0000)
Subject: Adapted to changes in the object file format.
X-Git-Tag: V2.13.3~529
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=73548dbfb3aa17f045ef2bd713bf7941af3b9dd5;p=cc65

Adapted to changes in the object file format.


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

diff --git a/src/ar65/library.c b/src/ar65/library.c
index 8eb178788..9f1944109 100644
--- a/src/ar65/library.c
+++ b/src/ar65/library.c
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2010, Ullrich von Bassewitz                                      */
+/* (C) 1998-2011, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -383,12 +383,16 @@ static void SkipExpr (unsigned char** Buf)
 
 
 
-static void SkipFilePos (unsigned char** Buf)
-/* Skip a file position in Buf */
+static void SkipLineInfoList (unsigned char** Buf)
+/* Skip a list of line infos in Buf */
 {
-    (void) GetVar (Buf);	/* Line */
-    (void) GetVar (Buf);	/* Col */
-    (void) GetVar (Buf);	/* Name */
+    /* Number of indices preceeds the list */
+    unsigned long Count = GetVar (Buf);
+
+    /* Skip indices */
+    while (Count--) {
+        (void) GetVar (Buf);
+    }
 }
 
 
@@ -429,8 +433,8 @@ static void LibCheckExports (ObjData* O)
      	    Exports += 4;
      	}
 
-     	/* Skip the position */
-       	SkipFilePos (&Exports);
+     	/* Skip the line info */
+       	SkipLineInfoList (&Exports);
 
       	/* Insert the name into the hash table */
 	Print (stdout, 1, "  %s\n", Name);
diff --git a/src/ar65/main.c b/src/ar65/main.c
index 5877520de..b2ba84ee9 100644
--- a/src/ar65/main.c
+++ b/src/ar65/main.c
@@ -6,7 +6,7 @@
 /*									     */
 /*									     */
 /*									     */
-/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/* (C) 1998-2011, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -121,7 +121,7 @@ int main (int argc, char* argv [])
 
 	    case 'V':
 		fprintf (stderr,
-       	       	       	 "ar65 V%s - (C) Copyright 1998-2009 Ullrich von Bassewitz\n",
+       	       	       	 "ar65 V%s - (C) Copyright 1998-2011 Ullrich von Bassewitz\n",
 			 GetVersionAsString ());
 		break;