From 2d047b1f49167fadc49900368feaf7cd5dcf6cfd Mon Sep 17 00:00:00 2001
From: Alexander Moibenko <anm12345@gmail.com>
Date: Fri, 8 Dec 2023 14:08:18 +0300
Subject: [PATCH] Revert "Found problem with fullup of product ID and Serial
 Number"

---
 mtx-1.3.12/mtx.c    | 11 -----------
 mtx-1.3.12/mtx.h    |  5 +----
 mtx-1.3.12/mtx.spec |  6 +-----
 mtx-1.3.12/mtxl.c   | 11 ++---------
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/mtx-1.3.12/mtx.c b/mtx-1.3.12/mtx.c
index dd3e958..a4f4d96 100644
--- a/mtx-1.3.12/mtx.c
+++ b/mtx-1.3.12/mtx.c
@@ -1040,17 +1040,6 @@ int parse_args(void)
 			device = argv[i++];
 			open_device(); /* open the device and do a status scan on it... */
 		}
-		else if (strcmp(argv[i], "-a") == 0)
-		{
-			printf("absolute addressing\n");
-			i++;
-                        if (i >= argc)
-                        {
-                                Usage();
-                        }
-			absolute_addressing = 1;
-		}
-
 		else
 		{
 			cmd_tbl_idx = 0;		/* default to the first command... */
diff --git a/mtx-1.3.12/mtx.h b/mtx-1.3.12/mtx.h
index db708bb..a56282d 100644
--- a/mtx-1.3.12/mtx.h
+++ b/mtx-1.3.12/mtx.h
@@ -565,10 +565,7 @@ TransportElementDescriptor_T;
 /* Now for element status data; */
 
 typedef unsigned char barcode[37];
-//typedef unsigned char serialnumber[13];
 typedef unsigned char serialnumber[13];
-typedef unsigned char devicetype[17];
-
 
 typedef struct ElementStatus {
 
@@ -578,7 +575,7 @@ typedef struct ElementStatus {
   int *DataTransferElementAddress;  /* array. */
   int *DataTransferElementSourceStorageElementNumber; /* array */
   int *DataTransferElementPhysicalLocation; /*array */ 
-  devicetype *DataTransferElementProductId; /*array */ 
+  serialnumber *DataTransferElementProductId; /*array */ 
   serialnumber *DataTransferElementSerialNumber; /*array */ 
   barcode *StorageElementPhysicalLocation; /*array */ 
   barcode *DataTransferPrimaryVolumeTag; /* array. */
diff --git a/mtx-1.3.12/mtx.spec b/mtx-1.3.12/mtx.spec
index 9667f40..6320502 100644
--- a/mtx-1.3.12/mtx.spec
+++ b/mtx-1.3.12/mtx.spec
@@ -1,6 +1,6 @@
 Name: mtx
 Version: 1.3.12
-Release: 19fnal_jinr%{?dist}
+Release: 15fnal%{?dist}
 Summary: SCSI media changer control program
 License: GPLv2
 Group: Applications/System
@@ -51,10 +51,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Dec 07 2023 Alexander Moibenko <moibenko@jinr.ru> - 1.3.12-19fnal
-- mtx CLI hasn hidden option (-a) to show status information with absolute addresses
-- Fixed problem seen in JINR where serial number was missing few last symbols 
-
 * Wed Jan 23 2019 Alexander Moibenko <moibenko@fnal.gov> - 1.3.12-15fnal
 - For absolute_addressing refresh elements data when status command is executed. This is needed to update tape library infortion in the calling program.
 - Changes to allow to use mtx as library and show absolute transfer and storage elements as output of status call
diff --git a/mtx-1.3.12/mtxl.c b/mtx-1.3.12/mtxl.c
index 3f0fe75..e577a57 100644
--- a/mtx-1.3.12/mtxl.c
+++ b/mtx-1.3.12/mtxl.c
@@ -563,7 +563,7 @@ static ElementStatus_T *AllocateElementData(ElementModeSense_T *mode_sense)
 	retval->DataTransferElementPhysicalLocation =
 		(int *)xzmalloc(sizeof(int) * (mode_sense->NumDataTransfer + 1));
 	retval->DataTransferElementProductId =
-		(devicetype *)xzmalloc(sizeof(devicetype) * (mode_sense->NumDataTransfer + 1));
+		(serialnumber *)xzmalloc(sizeof(serialnumber) * (mode_sense->NumDataTransfer + 1));
 	retval->DataTransferElementSerialNumber =
 		(serialnumber *)xzmalloc(sizeof(serialnumber) * (mode_sense->NumDataTransfer + 1));
 	retval->StorageElementPhysicalLocation =
@@ -618,16 +618,9 @@ void copy_physical_location(unsigned char *src, unsigned char *dest)
 void copy_char_buffer(unsigned char *src, unsigned char *dest, int num)
 {
   int i;
-  char *dest_tmp;
-  dest_tmp = dest;
-  while ((*src<= 32) || (*src > 127)) {
+  while ((*src< 32) || (*src > 127)) {
     src++;
   }
-  for (i=0; i < num; i++)
- {
-   *dest_tmp++ = 0;
- }
-
   for (i=0; i < num; i++)
  {
    *dest = *src++;