From f3708297178609a4eac4df5f616c30946fbb6146 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 26 May 2009 18:41:51 +0200
Subject: [PATCH] Removed old code for AAIP 1.0 production. Obsoleted macro
 Libisofs_aaip_2_0.

---
 libisofs/aaip_0_2.c       | 13 -------------
 libisofs/libisofs.h       |  6 +-----
 libisofs/rockridge.c      | 15 ---------------
 libisofs/rockridge_read.c | 28 ++--------------------------
 4 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/libisofs/aaip_0_2.c b/libisofs/aaip_0_2.c
index 2f42f8b..e8ecf53 100644
--- a/libisofs/aaip_0_2.c
+++ b/libisofs/aaip_0_2.c
@@ -128,13 +128,7 @@ size_t aaip_encode(size_t num_attrs, char **names,
  /* write the field headers */
  for(i= 0; i < number_of_fields; i++) {
    (*result)[i * 255 + 0]= 'A';
-
-#ifdef Libisofs_aaip_2_0
    (*result)[i * 255 + 1]= 'L';
-#else /* Libisofs_aaip_2_0 */
-   (*result)[i * 255 + 1]= 'A';
-#endif /* ! Libisofs_aaip_2_0 */
-
    if(i < number_of_fields - 1 || (mem_size % 255) == 0)
      (*result)[i * 255 + 2]= 255;
    else 
@@ -1186,16 +1180,9 @@ static int aaip_consume_aa_head(struct aaip_state *aaip,
  aaip->aa_head_missing-= todo;
  if(aaip->aa_head_missing == 0) {
    aaip_read_from_recs(aaip, aaip->recs_fill - 5, aa_head, 5, 0);
-
-#ifdef Libisofs_aaip_2_0
    if(aa_head[0] != 'A' || (aa_head[1] != 'L' && aa_head[1] != 'A') ||
       aa_head[3] != 1)
      return(-1);
-#else /* Libisofs_aaip_2_0 */
-   if(aa_head[0] != 'A' || aa_head[1] != 'A' || aa_head[3] != 1)
-     return(-1);
-#endif /* ! Libisofs_aaip_2_0 */
-
    aaip->aa_missing= aa_head[2];
    aaip->aa_ends= !(aa_head[4] & 1);
    aaip->recs_fill-= 5; /* AAIP field heads do not get delivered */
diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h
index e2890f8..e6f88d7 100644
--- a/libisofs/libisofs.h
+++ b/libisofs/libisofs.h
@@ -5419,11 +5419,7 @@ struct burn_source {
 
 /* ---------------------------- Improvements --------------------------- */
 
-
-/* Protocol Upgrade : change to AAIP-2.0 with field signature "AL"
-*/
-#define Libisofs_aaip_2_0 yes
-
+/* currently none being tested */
 
 /* ---------------------------- Experiments ---------------------------- */
 
diff --git a/libisofs/rockridge.c b/libisofs/rockridge.c
index 02de358..fbd64bf 100644
--- a/libisofs/rockridge.c
+++ b/libisofs/rockridge.c
@@ -662,9 +662,6 @@ int aaip_add_ER(Ecma119Image *t, struct susp_info *susp, int flag)
     ER[5] = 81;
     ER[6] = 62;
     ER[7] = 1;
-
-#ifdef Libisofs_aaip_2_0
-
     memcpy(ER + 8, "AAIP_0200", 9);
     memcpy(ER + 17,
            "AL PROVIDES VIA AAIP 2.0 SUPPORT FOR ARBITRARY FILE ATTRIBUTES"
@@ -673,18 +670,6 @@ int aaip_add_ER(Ecma119Image *t, struct susp_info *susp, int flag)
            "PLEASE CONTACT THE LIBBURNIA PROJECT VIA LIBBURNIA-PROJECT.ORG",
            62);
 
-#else /* Libisofs_aaip_2_0 */
-
-    memcpy(ER + 8, "AAIP_0100", 9);
-    memcpy(ER + 17,
-           "AA PROVIDES VIA AAIP 1.0 SUPPORT FOR ARBITRARY FILE ATTRIBUTES"
-           " IN ISO 9660 IMAGES", 81);
-    memcpy(ER + 98,
-           "PLEASE CONTACT THE LIBBURNIA PROJECT VIA LIBBURNIA-PROJECT.ORG",
-           62);
-
-#endif /* ! Libisofs_aaip_2_0 */
-
     /** This always goes to continuation area */
     return susp_append_ce(t, susp, ER);
 }
diff --git a/libisofs/rockridge_read.c b/libisofs/rockridge_read.c
index 1933968..8172176 100644
--- a/libisofs/rockridge_read.c
+++ b/libisofs/rockridge_read.c
@@ -496,26 +496,14 @@ int read_aaip_AA(struct susp_sys_user_entry *sue,
      aapt = *aa_string + *aa_len;
 
      aapt[0] = 'A';
-
-#ifdef Libisofs_aaip_2_0
      aapt[1] = 'L';
-#else /* Libisofs_aaip_2_0 */
-     aapt[1] = 'A';
-#endif /* ! Libisofs_aaip_2_0 */
-
      aapt[2] = sue->len_sue[0];
      aapt[3] = 1;
      aapt[4] = 0;
-     /* Append sue payload */
 
-#ifdef Libisofs_aaip_2_0
+     /* Append sue payload */
      memcpy(aapt + 5, sue->data.AL.comps, sue->len_sue[0] - 5);
      *is_done = !(sue->data.AL.flags[0] & 1);
-#else /* Libisofs_aaip_2_0 */
-     memcpy(aapt + 5, sue->data.AA.comps, sue->len_sue[0] - 5);
-     *is_done = !(sue->data.AA.flags[0] & 1);
-#endif /* ! Libisofs_aaip_2_0 */
-
      *aa_len += sue->len_sue[0];
 
      return ISO_SUCCESS;
@@ -558,26 +546,14 @@ int read_aaip_AL(struct susp_sys_user_entry *sue,
      aapt = *aa_string + *aa_len;
 
      aapt[0] = 'A';
-
-#ifdef Libisofs_aaip_2_0
      aapt[1] = 'L';
-#else /* Libisofs_aaip_2_0 */
-     aapt[1] = 'A';
-#endif /* ! Libisofs_aaip_2_0 */
-
      aapt[2] = sue->len_sue[0];
      aapt[3] = 1;
      aapt[4] = 0;
-     /* Append sue payload */
 
-#ifdef Libisofs_aaip_2_0
+     /* Append sue payload */
      memcpy(aapt + 5, sue->data.AL.comps, sue->len_sue[0] - 5);
      *is_done = !(sue->data.AL.flags[0] & 1);
-#else /* Libisofs_aaip_2_0 */
-     memcpy(aapt + 5, sue->data.AA.comps, sue->len_sue[0] - 5);
-     *is_done = !(sue->data.AA.flags[0] & 1);
-#endif /* ! Libisofs_aaip_2_0 */
-
      *aa_len += sue->len_sue[0];
 
      return ISO_SUCCESS;